DO NOT MERGE Fix listenerId in GeofenceManager am: a2f847e72f am: a743d5cb57 am: b0c37f67c8

Change-Id: I1d0c34fe9e9a4e5492bd034d950693854fa2ffdf
2020-04-16 00:20:38 +00:00
parent 0ea9243336 b0c37f67c8
commit 504ebe09e7
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/location/GeofenceManager.java
+++ b/services/core/java/com/android/server/location/GeofenceManager.java
@@ -253,7 +253,7 @@ public class GeofenceManager implements LocationListener, PendingIntent.OnFinish
                int op = CallerIdentity.asAppOp(identity.permissionLevel);
                if (op >= 0) {
                    if (mAppOps.noteOpNoThrow(AppOpsManager.OP_FINE_LOCATION, identity.uid,
-                            identity.packageName, identity.featureId, null)
+                            identity.packageName, identity.featureId, identity.listenerId)
                            != AppOpsManager.MODE_ALLOWED) {
                        continue;
                    }