From 4b67713709342dfa6d0059637aed49b457d2c62a Mon Sep 17 00:00:00 2001 From: Dan Sandler Date: Thu, 30 Jul 2015 22:33:12 -0400 Subject: Make DateTimeView more robust to weird contexts. In particular, some clients (*ahem* SystemUI) have been known to inflate RemoteViews with unusual derived contexts that may not have valid application contexts. DateTimeView can now resist this. Bug: 22852700 Change-Id: I5e91ae0e66859f5f5efd7b19c0ae6dfbc26bcc54 --- core/java/android/widget/DateTimeView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/java/android/widget') diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java index dcb2437..d20b924 100644 --- a/core/java/android/widget/DateTimeView.java +++ b/core/java/android/widget/DateTimeView.java @@ -16,6 +16,7 @@ package android.widget; +import android.app.ActivityThread; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -259,7 +260,7 @@ public class DateTimeView extends TextView { static final Context getApplicationContextIfAvailable(Context context) { final Context ac = context.getApplicationContext(); - return ac != null ? ac : context; + return ac != null ? ac : ActivityThread.currentApplication().getApplicationContext(); } void register(Context context) { -- cgit v1.1