commit 16b43e43f973896baa14961c4805979eeb310654
author Svetoslav Ganov <svetoslavganov@google.com> Thu Sep 03 18:52:07 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 18:52:07 2015 +0000
tree 7bbe491f502d98d0fc6cf40129eaba9109e82297
parent 0b65a9079edec71b28c64dff90d6e0debe8c69dd
parent e4428808bf4d26cbfdef1a6f19f2c9a794442a9b

am e4428808: am 8fddbc44: am a5cd5d87: am 0b5162c8: am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev

* commit 'e4428808bf4d26cbfdef1a6f19f2c9a794442a9b':
  Don't drop runtime permissions on older system app update.

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 88088fa..82afdd7 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -5999,12 +5999,6 @@
          */
         if (shouldHideSystemApp) {
             synchronized (mPackages) {
-                /*
-                 * We have to grant systems permissions before we hide, because
-                 * grantPermissions will assume the package update is trying to
-                 * expand its permissions.
-                 */
-                grantPermissionsLPw(pkg, true, pkg.packageName);
                 mSettings.disableSystemPackageLPw(pkg.packageName);
             }
         }