diff options
| author | Narayan Kamath <narayan@google.com> | 2014-08-15 17:57:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-15 04:32:23 +0000 |
| commit | 2b3b706e146f9d7773c9c2c99d969b48d89d237e (patch) | |
| tree | 0bf709453ad1d2abbefaba2c07c8a936200061f1 /core | |
| parent | e6b63e6c6fddbd6aaa51e69f9d43fd39c0f9e4ab (diff) | |
| parent | 3480ab45c82681399ac45d54105513baa9c041f6 (diff) | |
| download | frameworks_base-2b3b706e146f9d7773c9c2c99d969b48d89d237e.zip frameworks_base-2b3b706e146f9d7773c9c2c99d969b48d89d237e.tar.gz frameworks_base-2b3b706e146f9d7773c9c2c99d969b48d89d237e.tar.bz2 | |
Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index fed7ae3..d9ea671 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(); } |