summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-06-20 01:30:40 -0700
committerSvet Ganov <svetoslavganov@google.com>2015-06-20 01:30:44 -0700
commit0f800f7c163383ce3a49cc99bc2d8097f8961bde (patch)
treead3904c0b773bc111f366a249ef3d34d7723c1ef /services
parentd8e247db8cabe209966f4bfcb550637b45f18441 (diff)
downloadframeworks_base-0f800f7c163383ce3a49cc99bc2d8097f8961bde.zip
frameworks_base-0f800f7c163383ce3a49cc99bc2d8097f8961bde.tar.gz
frameworks_base-0f800f7c163383ce3a49cc99bc2d8097f8961bde.tar.bz2
Ensure default permissions not dropped on data wipe
bug:21954760 Change-Id: I15de766012e66e171d2089af574687ad513a5d57
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index dc38e54..95cb11d 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -12726,6 +12726,9 @@ public class PackageManagerService extends IPackageManager.Stub {
}
}
+ // Ensure default permissions are never cleared.
+ mDefaultPermissionPolicy.grantDefaultPermissions(userId);
+
if (needsWrite) {
mSettings.writeRuntimePermissionsForUserLPr(userId, true);
}