From a0c7e1360a6f7c780d75da3d33fba790168a57e5 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Fri, 23 Jun 2023 18:55:38 +0000
Subject: [PATCH] Revert "Revert "Enable the new permission subsystem
 implementation on V.""

This reverts commit 749623b859a6ae381d9e215e40e54abae8be172f.

Bug: 263504888
Test: presubmit
Reason for revert: Fixed test regressions

Change-Id: I09dedf9b09296fbb30c053c67f15e3ff77a0b941
---
 core/java/android/permission/PermissionManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java
index e256ea08cdd96..9ae87deccc8bc 100644
--- a/core/java/android/permission/PermissionManager.java
+++ b/core/java/android/permission/PermissionManager.java
@@ -75,6 +75,7 @@ import android.util.Slog;
 import com.android.internal.R;
 import com.android.internal.annotations.Immutable;
 import com.android.internal.util.CollectionUtils;
+import com.android.modules.utils.build.SdkLevel;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -181,7 +182,7 @@ public final class PermissionManager {
      *
      * @hide
      */
-    public static final boolean USE_ACCESS_CHECKING_SERVICE = false;
+    public static final boolean USE_ACCESS_CHECKING_SERVICE = SdkLevel.isAtLeastV();
 
     /**
      * The time to wait in between refreshing the exempted indicator role packages