am 66cff122: am 2e802cac: am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev

* commit '66cff122cc6d123b947be5f28186dc233a7be1aa':
  Make DateTimeView more robust to weird contexts.
  Make the RemoteViews context safe for Icons.

2 files changed, 6 insertions, 1 deletions

diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java
index dcb243760cd0..d20b9244a4b2 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) {
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index d1583136c408..7ca333947918 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -2746,6 +2746,10 @@ public class RemoteViews implements Parcelable, Filter {
             public Resources.Theme getTheme() {
                 return contextForResources.getTheme();
             }
+            @Override
+            public String getPackageName() {
+                return contextForResources.getPackageName();
+            }
         };
 
         LayoutInflater inflater = (LayoutInflater)