ThemeUtils: Retain the original package name in themed UI context

In order for themes to reflect on system elements, we're changing
their context, including the package name.

This breaks anything that tries to identify system elements,
most notably any users of the uiautomator. Trying to do
'UiSelector().packageName("android")' to find, for example,
a force-close dialog will fail.

Fixes com.android.cts.uiautomatortest.CtsUiAutomatorTest#testUiWatcher

Change-Id: Ic05c3024b20ac3772ed5597846fbfa4a184ebb0d

1 files changed, 18 insertions, 1 deletions

diff --git a/core/java/com/android/internal/app/ThemeUtils.java b/core/java/com/android/internal/app/ThemeUtils.java
index 4265fd5..2eda7fd 100644
--- a/core/java/com/android/internal/app/ThemeUtils.java
+++ b/core/java/com/android/internal/app/ThemeUtils.java
@@ -17,6 +17,7 @@
 package com.android.internal.app;
 
 import android.content.Context;
+import android.content.ContextWrapper;
 import android.content.BroadcastReceiver;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
@@ -32,9 +33,25 @@ public class ThemeUtils {
     private static final String DATA_TYPE_TMOBILE_THEME = "vnd.tmobile.cursor.item/theme";
     private static final String ACTION_TMOBILE_THEME_CHANGED = "com.tmobile.intent.action.THEME_CHANGED";
 
+    private static class ThemedUiContext extends ContextWrapper {
+        private String mPackageName;
+
+        public ThemedUiContext(Context context, String packageName) {
+            super(context);
+            mPackageName = packageName;
+        }
+
+        @Override
+        public String getPackageName() {
+            return mPackageName;
+        }
+    }
+
     public static Context createUiContext(final Context context) {
         try {
-            return context.createPackageContext("com.android.systemui", Context.CONTEXT_RESTRICTED);
+            Context uiContext = context.createPackageContext("com.android.systemui",
+                    Context.CONTEXT_RESTRICTED);
+            return new ThemedUiContext(uiContext, context.getPackageName());
         } catch (PackageManager.NameNotFoundException e) {
         }