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

Merge "TelephonyRegistry: Pass featureId to LocationAccessPolicy" am: 79490a9c00 am: a4c475a6cf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642444

Change-Id: Ic7e61bbe59537a7a7023920741e5f30d1f322b3c
This commit is contained in:
Jack Yu
2021-03-17 22:00:56 +00:00
committed by Automerger Merge Worker
parent a7913a0656 a4c475a6cf
commit 53942e8692
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

@@ -2764,6 +2764,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());
@@ -2913,6 +2914,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")
@@ -2936,6 +2938,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")