summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-07-29 17:37:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-29 17:37:50 +0000
commit120a86ac6f4ac6d2dfdef01dd1fbefdcd1cc8735 (patch)
tree56dae3215fc9e39a33a9f580360e8cdadef462f0 /services
parenteda1cc50cead674287616e6a852f8f281b70b9f5 (diff)
parentf480f2899cf4667170d93f6d7637e735b82d5bae (diff)
downloadframeworks_base-120a86ac6f4ac6d2dfdef01dd1fbefdcd1cc8735.zip
frameworks_base-120a86ac6f4ac6d2dfdef01dd1fbefdcd1cc8735.tar.gz
frameworks_base-120a86ac6f4ac6d2dfdef01dd1fbefdcd1cc8735.tar.bz2
Merge "Do not reset runtime permissions on upgrade" into mnc-dev
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index b7756ac..bfe67e9 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -298,7 +298,7 @@ public class PackageManagerService extends IPackageManager.Stub {
private static final boolean DEBUG_DEXOPT = false;
private static final boolean DEBUG_ABI_SELECTION = false;
- static final boolean CLEAR_RUNTIME_PERMISSIONS_ON_UPGRADE = Build.IS_DEBUGGABLE;
+ static final boolean CLEAR_RUNTIME_PERMISSIONS_ON_UPGRADE = false;
private static final int RADIO_UID = Process.PHONE_UID;
private static final int LOG_UID = Process.LOG_UID;