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

* commit '2fbe248c155a716d0345f683963aef7c95cc02b6':
  Grant default permissions if perms reset on upgrade.
This commit is contained in:
Svetoslav
2015-06-19 23:56:57 +00:00
committed by Android Git Automerger

View File

@@ -13690,7 +13690,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);