From 93bf3312626d6f7879cada66b8e51e53de1bbec4 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Fri, 11 Dec 2020 14:06:19 +0000
Subject: [PATCH] TelephonyRegistry: Pass featureId to LocationAccessPolicy

Bug: 162850073
Test: manual
Change-Id: I3a5afddfc151e06f5deb0220620bbd40849626c4
Merged-In: I3a5afddfc151e06f5deb0220620bbd40849626c4
---
 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 c4f1c805398b3..918aeb72105d6 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -2623,6 +2623,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());
@@ -2761,6 +2762,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")
@@ -2779,6 +2781,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")