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

Commit 2baaa823 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android (Google) Code Review
Browse files

Merge "TelephonyRegistry: Pass featureId to LocationAccessPolicy"

parents c25364b5 923b6d86

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

+3 −0
Original line number Diff line number Diff line
@@ -2701,6 +2701,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());
@@ -2859,6 +2860,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")
@@ -2884,6 +2886,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")