Merge "DO NOT MERGE Fix listenerId in GeofenceManager" into rvc-dev

2020-04-15 23:43:46 +00:00
parent 299a251140 a2f847e72f
commit 08bd8964e1
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;
                    }