commit 7bd8e6a8f2d0d200fd9a74b55469492cc02de6a4
author Dan Sandler <dsandler@android.com> Thu Jul 30 11:46:10 2015 -0400
committer Dan Sandler <dsandler@android.com> Thu Jul 30 11:59:30 2015 -0400
tree d97d6b9965a8a934bfe0fefda463f6f7c891a320
parent c1d5b6c18c3b92708958daa998da2ec55adce00e

DateTimeView: don't assume you have an ApplicationContext.

Bug: 22840771
Change-Id: I3be6369936f90e9ce4e61a59ea81b0d3408a0f99

core/java/android/widget/DateTimeView.java

diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java
index 0b5824a..dcb2437 100644
--- a/core/java/android/widget/DateTimeView.java
+++ b/core/java/android/widget/DateTimeView.java
@@ -25,7 +25,6 @@
 import android.text.format.Time;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.widget.TextView;
 import android.widget.RemoteViews.RemoteView;
 
 import java.text.DateFormat;
@@ -228,14 +227,14 @@
             final boolean register = mAttachedViews.isEmpty();
             mAttachedViews.add(v);
             if (register) {
-                register(v.getContext().getApplicationContext());
+                register(getApplicationContextIfAvailable(v.getContext()));
             }
         }
 
         public void removeView(DateTimeView v) {
             mAttachedViews.remove(v);
             if (mAttachedViews.isEmpty()) {
-                unregister(v.getContext().getApplicationContext());
+                unregister(getApplicationContextIfAvailable(v.getContext()));
             }
         }
 
@@ -258,6 +257,11 @@
             return result;
         }
 
+        static final Context getApplicationContextIfAvailable(Context context) {
+            final Context ac = context.getApplicationContext();
+            return ac != null ? ac : context;
+        }
+
         void register(Context context) {
             final IntentFilter filter = new IntentFilter();
             filter.addAction(Intent.ACTION_TIME_TICK);