diff options
| author | Kenny Guy <kennyguy@google.com> | 2014-09-08 13:57:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-08 13:57:09 +0000 |
| commit | b7451e49231b45dbc54690f094d1ff3b4456f00d (patch) | |
| tree | 577ed350a909fa3ed306935089de1009a428c72d /core/java/android/app/ContextImpl.java | |
| parent | 2c22d1920f4f4e39712711aa98b44410d81ae7c2 (diff) | |
| parent | 1cc721208603880c9a12423ad617dc627b17c1be (diff) | |
| download | frameworks_base-b7451e49231b45dbc54690f094d1ff3b4456f00d.zip frameworks_base-b7451e49231b45dbc54690f094d1ff3b4456f00d.tar.gz frameworks_base-b7451e49231b45dbc54690f094d1ff3b4456f00d.tar.bz2 | |
am 444c3a9e: am f919288d: am b78a0a11: Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev
* commit '444c3a9eb36e5a2fa9e19c0aed2691503ace43e4':
Ensure ApplicationInfo is for correct user for system/android package.
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index bff9d13..e91271f 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -2130,7 +2130,9 @@ class ContextImpl extends Context { public Context createPackageContextAsUser(String packageName, int flags, UserHandle user) throws NameNotFoundException { final boolean restricted = (flags & CONTEXT_RESTRICTED) == CONTEXT_RESTRICTED; - if (packageName.equals("system") || packageName.equals("android")) { + if ((packageName.equals("system") || packageName.equals("android")) + && user.getIdentifier() == UserHandle.getUserId( + mPackageInfo.getApplicationInfo().uid)) { return new ContextImpl(this, mMainThread, mPackageInfo, mActivityToken, user, restricted, mDisplay, mOverrideConfiguration); } |