Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index fed7ae388720..d9ea671071ba 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -1811,6 +1811,10 @@ public final class ActivityThread {
         synchronized (this) {
             getSystemContext().installSystemApplicationInfo(info, classLoader);
 
+            // The code package for "android" in the system server needs
+            // to be the system context's package.
+            mPackages.put("android", new WeakReference<LoadedApk>(getSystemContext().mPackageInfo));
+
             // give ourselves a default profiler
             mProfiler = new Profiler();
         }