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

Merge "Clean up SystemServiceRegistry."

Browse Source
This commit is contained in:
Makoto Onuki
2019-10-04 17:01:22 +00:00
committed by Android (Google) Code Review
parent 69657278ed 3ff9876cbd
commit ec55b7a13d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/jobscheduler/framework/java/android/app/DeviceIdleFrameworkInitializer.java
View File

@@ -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.

4
core/java/android/app/SystemServiceRegistry.java
View File

@@ -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);
}});
}