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

1 files changed, 2 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 275db1fa543d..717461229d10 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<>();
                         }