Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TelephonyRegistry: Pass featureId to LocationAccessPolicy

Browse Source 
Bug: 162850073
Test: manual
Merged-In: I3a5afddfc151e06f5deb0220620bbd40849626c4
Change-Id: I3a5afddfc151e06f5deb0220620bbd40849626c4
(cherry picked from commit 923b6d8678)
This commit is contained in:
Narayan Kamath
2020-12-11 14:06:19 +00:00
committed by Jack Yu
parent eccbfe4b72
commit 951ceccfd7
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -2762,6 +2762,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
LocationAccessPolicy.LocationPermissionQuery.Builder locationQueryBuilder = LocationAccessPolicy.LocationPermissionQuery.Builder locationQueryBuilder =
new LocationAccessPolicy.LocationPermissionQuery.Builder() new LocationAccessPolicy.LocationPermissionQuery.Builder()
.setCallingPackage(callingPackage) .setCallingPackage(callingPackage)
.setCallingFeatureId(callingFeatureId)
.setMethod(message + " events: " + events) .setMethod(message + " events: " + events)
.setCallingPid(Binder.getCallingPid()) .setCallingPid(Binder.getCallingPid())
.setCallingUid(Binder.getCallingUid()); .setCallingUid(Binder.getCallingUid());
@@ -2911,6 +2912,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
LocationAccessPolicy.LocationPermissionQuery query = LocationAccessPolicy.LocationPermissionQuery query =
new LocationAccessPolicy.LocationPermissionQuery.Builder() new LocationAccessPolicy.LocationPermissionQuery.Builder()
.setCallingPackage(r.callingPackage) .setCallingPackage(r.callingPackage)
.setCallingFeatureId(r.callingFeatureId)
.setCallingPid(r.callerPid) .setCallingPid(r.callerPid)
.setCallingUid(r.callerUid) .setCallingUid(r.callerUid)
.setMethod("TelephonyRegistry push") .setMethod("TelephonyRegistry push")
@@ -2934,6 +2936,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
LocationAccessPolicy.LocationPermissionQuery query = LocationAccessPolicy.LocationPermissionQuery query =
new LocationAccessPolicy.LocationPermissionQuery.Builder() new LocationAccessPolicy.LocationPermissionQuery.Builder()
.setCallingPackage(r.callingPackage) .setCallingPackage(r.callingPackage)
.setCallingFeatureId(r.callingFeatureId)
.setCallingPid(r.callerPid) .setCallingPid(r.callerPid)
.setCallingUid(r.callerUid) .setCallingUid(r.callerUid)
.setMethod("TelephonyRegistry push") .setMethod("TelephonyRegistry push")