am 1578357d: Merge "Check user state after clearing identity." into mnc-dev

* commit '1578357df737296aa151c6934fe7dd749a43ae15':
  Check user state after clearing identity.
This commit is contained in:
Amith Yamasani
2015-07-13 23:02:03 +00:00
committed by Android Git Automerger

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