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

Commit d1cf3dec authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7221907 from 1c9ac73a to rvc-qpr3-release 

Change-Id: I70b169ac48df7e3116e42411578ba0900a9651db
parents f4e51645 1c9ac73a

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

+2 −0
Original line number Diff line number Diff line
@@ -1505,6 +1505,8 @@ public final class BatteryService extends SystemService { 
                            if (Objects.equals(newService, oldService)) return;



                            Slog.i(TAG, "health: new instance registered " + mInstanceName);

                            // #init() may be called with null callback. Skip null callbacks.

                            if (mCallback == null) return;

                            mCallback.onRegistration(oldService, newService, mInstanceName);

                        } catch (NoSuchElementException | RemoteException ex) {

                            Slog.e(TAG, "health: Cannot get instance '" + mInstanceName

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

+3 −0
Original line number Diff line number Diff line
@@ -2623,6 +2623,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());
@@ -2761,6 +2762,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")
@@ -2779,6 +2781,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")