Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 628a5536 authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into... 

Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into sc-qpr1-dev am: 96a5a3b9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18200760



Change-Id: Id5ef00296c5d94bd1e8ba2ccb9819b5c194fe849
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e87182f9 96a5a3b9

core/java/android/app/AppOpsManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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