From 3480ab45c82681399ac45d54105513baa9c041f6 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Fri, 15 Aug 2014 18:11:04 +0100
Subject: Fix getPackageInfo for the "android" package in the system server.

bug: 16555230
Change-Id: I90ebf9b35fda8246b0079f67b1469f96c3b4ede2
---
 core/java/android/app/ActivityThread.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'core')

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 1b82d8e..861e789 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);
 
+            // 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();
         }
-- 
cgit v1.1