Merge "System context should inherit base package name."
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 8942135..64a05a8 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -1480,7 +1480,9 @@
     public Context createPackageContext(String packageName, int flags)
         throws PackageManager.NameNotFoundException {
         if (packageName.equals("system") || packageName.equals("android")) {
-            return new ContextImpl(mMainThread.getSystemContext());
+            final ContextImpl context = new ContextImpl(mMainThread.getSystemContext());
+            context.mBasePackageName = mBasePackageName;
+            return context;
         }
 
         LoadedApk pi =