diff options
| author | Evan Severson <evanseverson@google.com> | 2022-06-04 00:20:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-04 00:20:29 +0000 |
| commit | 628a5536613c98685edf0ff86586949adea5e019 (patch) | |
| tree | 149aa8f1b04be7d725e80eecf7f9f70de30ad5bf /core/java | |
| parent | e87182f96344009f27501201f6148e0f15f81e35 (diff) | |
| parent | 96a5a3b953bd8c4e642bcf64570ed5fd60257fc0 (diff) | |
Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into sc-qpr1-dev am: 96a5a3b953
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18200760
Change-Id: Id5ef00296c5d94bd1e8ba2ccb9819b5c194fe849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index d932a29beca6..643df9240de9 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -2463,8 +2463,8 @@ public class AppOpsManager { * 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 |