From 4f41e849f1b7d6d037439d60eace1b134165a148 Mon Sep 17 00:00:00 2001
From: Fyodor Kupolov <fkupolov@google.com>
Date: Thu, 19 Oct 2017 11:45:29 -0700
Subject: [PATCH] Fail only if CONTROL_PRIVAPP_PERMISSIONS_ENFORCE

Previously the error was also thrown if ro.control_privapp_permissions=log

Test: manual
Bug: 64693550
Change-Id: Ia87984e2e5902dd885feeb37f676956fa56b421c
---
 .../core/java/com/android/server/pm/PackageManagerService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 275db1fa543dd..717461229d108 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -12428,7 +12428,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<>();
                         }