commit 2fbe248c155a716d0345f683963aef7c95cc02b6
author Svetoslav <svetoslavganov@google.com> Fri Jun 19 23:43:10 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 19 23:43:11 2015 +0000
tree d5a49d5c7d0e86d31dbfa823b9f7068c2076a77e
parent a51f8b90f53acbd8967755a39096705704980d05
parent f9f75771cc28035525520128e8a74c898c43e12a

Merge "Grant default permissions if perms reset on upgrade." into mnc-dev

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 5b876ad..dc38e54 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -13690,7 +13690,7 @@
         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);