diff options
author | Amith Yamasani <yamasani@google.com> | 2015-07-11 10:24:45 -0700 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2015-07-11 10:24:45 -0700 |
commit | 2d42d5f41eefc5550b6750cb86a5324c8f28959f (patch) | |
tree | 78058cfd66b008872905859a8d79376c53e83417 /services | |
parent | 1b3d03512e7bc759d3cd340280d7a5c59195a063 (diff) | |
download | frameworks_base-2d42d5f41eefc5550b6750cb86a5324c8f28959f.zip frameworks_base-2d42d5f41eefc5550b6750cb86a5324c8f28959f.tar.gz frameworks_base-2d42d5f41eefc5550b6750cb86a5324c8f28959f.tar.bz2 |
Check user state after clearing identity.
This is to fix the case where the caller has GRANT_REVOKE_PERMISSIONS
but does not have MANAGE_USERS permission.
Related to a recent fix for
Bug: 22356546
Change-Id: Id51157abad14a0bdba3a16d7cd168f61ba25e890
Diffstat (limited to 'services')
-rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index bfb803d..2bd0018 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -3461,13 +3461,14 @@ public class PackageManagerService extends IPackageManager.Stub { // Only need to do this if user is initialized. Otherwise it's a new user // and there are no processes running as the user yet and there's no need // to make an expensive call to remount processes for the changed permissions. - if ((READ_EXTERNAL_STORAGE.equals(name) - || WRITE_EXTERNAL_STORAGE.equals(name)) - && sUserManager.isInitialized(userId)) { + if (READ_EXTERNAL_STORAGE.equals(name) + || WRITE_EXTERNAL_STORAGE.equals(name)) { final long token = Binder.clearCallingIdentity(); try { - final StorageManager storage = mContext.getSystemService(StorageManager.class); - storage.remountUid(uid); + if (sUserManager.isInitialized(userId)) { + final StorageManager storage = mContext.getSystemService(StorageManager.class); + storage.remountUid(uid); + } } finally { Binder.restoreCallingIdentity(token); } |