Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check user state after clearing identity.

Browse Source 
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
This commit is contained in:
Amith Yamasani
2015-07-11 10:24:45 -07:00
parent 1b3d03512e
commit 2d42d5f41e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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);
}