From a2f847e72fe421675a559bbb67957a1370753e19 Mon Sep 17 00:00:00 2001
From: Soonil Nagarkar <sooniln@google.com>
Date: Wed, 15 Apr 2020 14:24:07 -0700
Subject: [PATCH] DO NOT MERGE Fix listenerId in GeofenceManager

Bug: 153257294
Test: atest AppOpsLoggingTest
Change-Id: I158dae57c1f67e6ec14e617fbf76c7b79fea0cab
---
 .../core/java/com/android/server/location/GeofenceManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/location/GeofenceManager.java b/services/core/java/com/android/server/location/GeofenceManager.java
index 195b059b7374d..095cd146da4f0 100644
--- 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;
                     }