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

Commit ec55b7a1 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Clean up SystemServiceRegistry."

parents 69657278 3ff9876c

apex/jobscheduler/framework/java/android/app/DeviceIdleFrameworkInitializer.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public class DeviceIdleFrameworkInitializer { 
        SystemServiceRegistry.registerCachedService(

                Context.DEVICE_IDLE_CONTROLLER, DeviceIdleManager.class,

                (context, b) -> new DeviceIdleManager(

                        context.getOuterContext(), IDeviceIdleController.Stub.asInterface(b)));

                        context, IDeviceIdleController.Stub.asInterface(b)));

        PowerManager.setIsIgnoringBatteryOptimizationsCallback((packageName) -> {

            // No need for synchronization on sIDeviceIdleController; worst case

            // we just initialize it twice.

core/java/android/app/SystemServiceRegistry.java

+2 −2
Original line number Diff line number Diff line
@@ -1343,13 +1343,13 @@ public final class SystemServiceRegistry { 
     * @hide

     */

    public static <T> void registerCachedService(String serviceName, Class<T> serviceWrapperClass,

            BiFunction<ContextImpl, IBinder, T> serviceFetcher) {

            BiFunction<Context, IBinder, T> serviceFetcher) {

        registerService(serviceName, serviceWrapperClass,

                new CachedServiceFetcher<T>() {

                    @Override

                    public T createService(ContextImpl ctx) throws ServiceNotFoundException {

                        IBinder b = ServiceManager.getServiceOrThrow(serviceName);

                        return serviceFetcher.apply(ctx, b);

                        return serviceFetcher.apply(ctx.getOuterContext(), b);

                    }});

    }