Merge "Fail only if CONTROL_PRIVAPP_PERMISSIONS_ENFORCE"

2017-10-19 21:01:58 +00:00
parent e7e1aaec96 4f41e849f1
commit 9ec4897a3d
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -12443,7 +12443,8 @@ public class PackageManagerService extends IPackageManager.Stub
                            .getPrivAppDenyPermissions(pkg.packageName);
                    final boolean permissionViolation =
                            deniedPermissions == null || !deniedPermissions.contains(perm);
-                    if (permissionViolation) {
+                    if (permissionViolation
+                            && RoSystemProperties.CONTROL_PRIVAPP_PERMISSIONS_ENFORCE) {
                        if (mPrivappPermissionsViolations == null) {
                            mPrivappPermissionsViolations = new ArraySet<>();
                        }