From f9f75771cc28035525520128e8a74c898c43e12a Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Fri, 19 Jun 2015 16:42:22 -0700
Subject: [PATCH] Grant default permissions if perms reset on upgrade.

Change-Id: I371e8eb42dc8e8953a184d29cc2a3bd2c361097e
---
 .../core/java/com/android/server/pm/PackageManagerService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 5b876ad954c9f..dc38e54819631 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 @@ 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);