From 951ceccfd72a9cd97731ee5e87f1619d5e8fd301 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Fri, 11 Dec 2020 14:06:19 +0000 Subject: [PATCH] TelephonyRegistry: Pass featureId to LocationAccessPolicy Bug: 162850073 Test: manual Merged-In: I3a5afddfc151e06f5deb0220620bbd40849626c4 Change-Id: I3a5afddfc151e06f5deb0220620bbd40849626c4 (cherry picked from commit 923b6d86784d2109e6cd0953215c37d8cf460ee7) --- services/core/java/com/android/server/TelephonyRegistry.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index c51a606213122..2078f294c132a 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -2762,6 +2762,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { LocationAccessPolicy.LocationPermissionQuery.Builder locationQueryBuilder = new LocationAccessPolicy.LocationPermissionQuery.Builder() .setCallingPackage(callingPackage) + .setCallingFeatureId(callingFeatureId) .setMethod(message + " events: " + events) .setCallingPid(Binder.getCallingPid()) .setCallingUid(Binder.getCallingUid()); @@ -2911,6 +2912,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { LocationAccessPolicy.LocationPermissionQuery query = new LocationAccessPolicy.LocationPermissionQuery.Builder() .setCallingPackage(r.callingPackage) + .setCallingFeatureId(r.callingFeatureId) .setCallingPid(r.callerPid) .setCallingUid(r.callerUid) .setMethod("TelephonyRegistry push") @@ -2934,6 +2936,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { LocationAccessPolicy.LocationPermissionQuery query = new LocationAccessPolicy.LocationPermissionQuery.Builder() .setCallingPackage(r.callingPackage) + .setCallingFeatureId(r.callingFeatureId) .setCallingPid(r.callerPid) .setCallingUid(r.callerUid) .setMethod("TelephonyRegistry push")