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

Commit 74fef036 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix bug checking incorrect AppOp" into sc-qpr1-dev am: 886d034f am: 6c3520b4 

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

Change-Id: I1d203fa4906989393ddccd9bccf2cde7e3ab768f
parents e6317a9f 6c3520b4

services/core/java/com/android/server/location/injector/LocationPermissionsHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public abstract class LocationPermissionsHelper { 
            return false;

        }



        return mAppOps.checkOpNoThrow(permissionLevel, identity);

        return mAppOps.checkOpNoThrow(LocationPermissions.asAppOp(permissionLevel), identity);

    }



    protected abstract boolean hasPermission(String permission, CallerIdentity callerIdentity);