Fix fetching application context for ThemedUiContext.

Change-Id: I7719fc8823fef93556f5a9ab088a77b73cf7eeff

1 files changed, 10 insertions, 5 deletions

diff --git a/core/java/android/content/pm/ThemeUtils.java b/core/java/android/content/pm/ThemeUtils.java
index 9d246c3..c7ea439 100644
--- a/core/java/android/content/pm/ThemeUtils.java
+++ b/core/java/android/content/pm/ThemeUtils.java
@@ -512,7 +512,7 @@ public class ThemeUtils {
         try {
             Context uiContext = context.createPackageContext("com.android.systemui",
                     Context.CONTEXT_RESTRICTED);
-            return new ThemedUiContext(uiContext, context.getPackageName());
+            return new ThemedUiContext(uiContext, context.getApplicationContext());
         } catch (PackageManager.NameNotFoundException e) {
         }
 
@@ -574,16 +574,21 @@ public class ThemeUtils {
     }
 
     private static class ThemedUiContext extends ContextWrapper {
-        private String mPackageName;
+        private Context mAppContext;
 
-        public ThemedUiContext(Context context, String packageName) {
+        public ThemedUiContext(Context context, Context appContext) {
             super(context);
-            mPackageName = packageName;
+            mAppContext = appContext;
+        }
+
+        @Override
+        public Context getApplicationContext() {
+            return mAppContext;
         }
 
         @Override
         public String getPackageName() {
-            return mPackageName;
+            return mAppContext.getPackageName();
         }
     }