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

Commit 33bc954b authored by Soonil Nagarkar's avatar Soonil Nagarkar
Browse files

Fix logic for clients with no location permissions 

There are edge cases when this is possible, such as when the dialer's
location permission is revoked at the end of an emergency call.

Bug: 158445301
Test: presubmits
Change-Id: I6f02f1e0651bb4775773b2e4290557dfa9165afd
parent 966e038d

services/core/java/com/android/server/location/util/AppOpsHelper.java

+8 −0
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@ public class AppOpsHelper { 
            Preconditions.checkState(mAppOps != null);

        }



        if (permissionLevel == LocationPermissions.PERMISSION_NONE) {

            return false;

        }



        long identity = Binder.clearCallingIdentity();

        try {

            return mAppOps.checkOpNoThrow(
@@ -145,6 +149,10 @@ public class AppOpsHelper { 
     */

    public boolean noteLocationAccess(CallerIdentity identity,

            @PermissionLevel int permissionLevel) {

        if (permissionLevel == LocationPermissions.PERMISSION_NONE) {

            return false;

        }



        return noteOpNoThrow(LocationPermissions.asAppOp(permissionLevel), identity);

    }