summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorEvan Severson <evanseverson@google.com>2022-05-19 22:30:39 +0000
committerPresubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com>2022-05-19 22:30:39 +0000
commitb2bd6deb2f6b95b01002d4eec0f6fdb5f9f20703 (patch)
treea4f4ba1ca5c02c8ac332858f04b92c6344ba0ec4 /core/java/android
parentabb06fd681a9a6b9f99402c88f766e6e01e36335 (diff)
parent807f4cfc80728313d04f95343e5aea14691aceb0 (diff)
[automerge] Disallow privileged apps to bypass location restriction 2p: 807f4cfc80
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18200760 Bug: 230861324 Bug: 231496105 Change-Id: Id9ef42373dcafb8a751c7002ba08df49dca87ace Merged-In: Ib34c0b56ef52f5ee2deceb84b02cd0ff73d8181d
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/AppOpsManager.java4
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