summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-07-29 17:58:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-29 17:58:20 +0000
commit7b45b0fbf14c43521560a7bf115ec5c92cda1788 (patch)
tree7de8c161e6ecedbe49d216926d7680be0e2942b7 /services
parentdeb28b770a0b11604fc20c71044a9c2d9718fe06 (diff)
parent120a86ac6f4ac6d2dfdef01dd1fbefdcd1cc8735 (diff)
downloadframeworks_base-7b45b0fbf14c43521560a7bf115ec5c92cda1788.zip
frameworks_base-7b45b0fbf14c43521560a7bf115ec5c92cda1788.tar.gz
frameworks_base-7b45b0fbf14c43521560a7bf115ec5c92cda1788.tar.bz2
am 120a86ac: Merge "Do not reset runtime permissions on upgrade" into mnc-dev
* commit '120a86ac6f4ac6d2dfdef01dd1fbefdcd1cc8735': Do not reset runtime permissions on upgrade
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 f6e5308..513e7b1 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;