Fix fetching application context for ThemedUiContext. (455c8e23) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/ThemeUtils.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}