am 635ace07: am 3adcfab7: am 2fbe248c: Merge "Grant default permissions if perms reset on upgrade." into mnc-dev

* commit '635ace07294ea2508fdd3ba4194e8d6b377c2031':
  Grant default permissions if perms reset on upgrade.
This commit is contained in:
Svetoslav
2015-06-20 00:22:55 +00:00
committed by Android Git Automerger

View File

@@ -13688,7 +13688,7 @@ public class PackageManagerService extends IPackageManager.Stub {
sUserManager.systemReady();
// If we upgraded grant all default permissions before kicking off.
if (isFirstBoot()) {
if (isFirstBoot() || (CLEAR_RUNTIME_PERMISSIONS_ON_UPGRADE && mIsUpgrade)) {
updatePermissionsLPw(null, null, UPDATE_PERMISSIONS_ALL);
for (int userId : UserManagerService.getInstance().getUserIds()) {
mDefaultPermissionPolicy.grantDefaultPermissions(userId);