Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53942e86 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "TelephonyRegistry: Pass featureId to LocationAccessPolicy" am: 79490a9c am: a4c475a6 

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

Change-Id: Ic7e61bbe59537a7a7023920741e5f30d1f322b3c
parents a7913a06 a4c475a6

services/core/java/com/android/server/TelephonyRegistry.java

+3 −0
Original line number Diff line number Diff line
@@ -2764,6 +2764,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());
@@ -2913,6 +2914,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")
@@ -2936,6 +2938,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")