From 923b6d86784d2109e6cd0953215c37d8cf460ee7 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
---
 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 52eb77d7d47d9..c8738df2b87dc 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -2665,6 +2665,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());
@@ -2823,6 +2824,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")
@@ -2848,6 +2850,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")