am e5bce22d: Merge "Defer writes to runtime-permissions.xml" into mnc-dev

* commit 'e5bce22dc098d5da9ff573f4aac812272de3c0af':
  Defer writes to runtime-permissions.xml
This commit is contained in:
Fyodor Kupolov
2015-06-18 23:10:00 +00:00
committed by Android Git Automerger

View File

@@ -7724,7 +7724,7 @@ public class PackageManagerService extends IPackageManager.Stub {
}
}
}
if (pkgInfo != null) {
grantPermissionsLPw(pkgInfo, (flags&UPDATE_PERMISSIONS_REPLACE_PKG) != 0, changingPkg);
}
@@ -8004,7 +8004,7 @@ public class PackageManagerService extends IPackageManager.Stub {
// Persist the runtime permissions state for users with changes.
for (int userId : changedRuntimePermissionUserIds) {
mSettings.writeRuntimePermissionsForUserLPr(userId, true);
mSettings.writeRuntimePermissionsForUserLPr(userId, false);
}
}