commit 530407c903c3b06c6bd0a423937531f95eb116ae
author Evan Severson <evanseverson@google.com> Fri Apr 29 14:13:29 2022 -0700
committer Evan Severson <evanseverson@google.com> Fri Apr 29 21:51:06 2022 +0000
tree f9f64c874b7bbcd96378612d8c33df1be82a5b3d
parent 6298c68c71d3f097a9485f7266faa2b0013eadd2

Disallow privileged apps to bypass location restriction

This bypass was originally allowed to let restricted users who can't use
location to pair bluetooth devices. This isn't needed anymore with the
bluetooth permissions.

Test: Set up restricted profile and pair bluetooth
      Verify com.android.phone gets rejected
Fixes: 230861324
Change-Id: Ib34c0b56ef52f5ee2deceb84b02cd0ff73d8181d

core/java/android/app/AppOpsManager.java

diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index 6e395be..c7c654a 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -2537,8 +2537,8 @@
      * restriction} for a certain app-op.
      */
     private static RestrictionBypass[] sOpAllowSystemRestrictionBypass = new RestrictionBypass[] {
-            new RestrictionBypass(true, false), //COARSE_LOCATION
-            new RestrictionBypass(true, false), //FINE_LOCATION
+            null, //COARSE_LOCATION
+            null, //FINE_LOCATION
             null, //GPS
             null, //VIBRATE
             null, //READ_CONTACTS