commit f9f75771cc28035525520128e8a74c898c43e12a
author Svetoslav <svetoslavganov@google.com> Fri Jun 19 16:42:22 2015 -0700
committer Svetoslav <svetoslavganov@google.com> Fri Jun 19 16:42:22 2015 -0700
tree b0ffb8b8b23122ae90d91b0f78b1a63498765edb
parent 1e575a0f32a00fc6a2f9a71fe1d1eb4426c71787

Grant default permissions if perms reset on upgrade.

Change-Id: I371e8eb42dc8e8953a184d29cc2a3bd2c361097e

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