DateTimeView: don't assume you have an ApplicationContext. (3de053fb) · Commits · e / os / android_frameworks_base

core/java/android/widget/DateTimeView.java

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,6 @@ import android.os.Handler;
	import android.text.format.Time;		import android.text.format.Time;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	import android.util.Log;		import android.util.Log;
	import android.widget.TextView;
	import android.widget.RemoteViews.RemoteView;		import android.widget.RemoteViews.RemoteView;

	import java.text.DateFormat;		import java.text.DateFormat;
	@@ -228,14 +227,14 @@ public class DateTimeView extends TextView {
	final boolean register = mAttachedViews.isEmpty();		final boolean register = mAttachedViews.isEmpty();
	mAttachedViews.add(v);		mAttachedViews.add(v);
	if (register) {		if (register) {
	register(v.getContext().getApplicationContext());		register(getApplicationContextIfAvailable(v.getContext()));
	}		}
	}		}

	public void removeView(DateTimeView v) {		public void removeView(DateTimeView v) {
	mAttachedViews.remove(v);		mAttachedViews.remove(v);
	if (mAttachedViews.isEmpty()) {		if (mAttachedViews.isEmpty()) {
	unregister(v.getContext().getApplicationContext());		unregister(getApplicationContextIfAvailable(v.getContext()));
	}		}
	}		}

	@@ -258,6 +257,11 @@ public class DateTimeView extends TextView {
	return result;		return result;
	}		}

			static final Context getApplicationContextIfAvailable(Context context) {
			final Context ac = context.getApplicationContext();
			return ac != null ? ac : context;
			}

	void register(Context context) {		void register(Context context) {
	final IntentFilter filter = new IntentFilter();		final IntentFilter filter = new IntentFilter();
	filter.addAction(Intent.ACTION_TIME_TICK);		filter.addAction(Intent.ACTION_TIME_TICK);