DO NOT MERGE Fix listenerId in GeofenceManager

Bug: 153257294 Test: atest AppOpsLoggingTest Change-Id: I158dae57c1f67e6ec14e617fbf76c7b79fea0cab
2020-04-15 14:24:07 -07:00
parent 73a8e537ca
commit a2f847e72f
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;
                    }