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

This commit is contained in:
TreeHugger Robot
2020-04-15 23:43:46 +00:00
committed by Android (Google) Code Review

View File

@@ -253,7 +253,7 @@ public class GeofenceManager implements LocationListener, PendingIntent.OnFinish
int op = CallerIdentity.asAppOp(identity.permissionLevel); int op = CallerIdentity.asAppOp(identity.permissionLevel);
if (op >= 0) { if (op >= 0) {
if (mAppOps.noteOpNoThrow(AppOpsManager.OP_FINE_LOCATION, identity.uid, if (mAppOps.noteOpNoThrow(AppOpsManager.OP_FINE_LOCATION, identity.uid,
identity.packageName, identity.featureId, null) identity.packageName, identity.featureId, identity.listenerId)
!= AppOpsManager.MODE_ALLOWED) { != AppOpsManager.MODE_ALLOWED) {
continue; continue;
} }