Merge "Initialize JobScheduler without using preload"

This commit is contained in:
Makoto Onuki
2019-10-31 22:32:24 +00:00
committed by Android (Google) Code Review
3 changed files with 7 additions and 3 deletions

View File

@@ -32,7 +32,7 @@ import android.os.ServiceManager;
public class DeviceIdleFrameworkInitializer {
private static IDeviceIdleController sIDeviceIdleController;
static {
public static void initialize() {
SystemServiceRegistry.registerCachedService(
Context.DEVICE_IDLE_CONTROLLER, DeviceIdleManager.class,
(context, b) -> new DeviceIdleManager(

View File

@@ -28,7 +28,7 @@ import android.os.BatteryStats;
* @hide
*/
public class JobSchedulerFrameworkInitializer {
static {
public static void initialize() {
SystemServiceRegistry.registerStaticService(
Context.JOB_SCHEDULER_SERVICE, JobScheduler.class,
(b) -> new JobSchedulerImpl(IJobScheduler.Stub.asInterface(b)));

View File

@@ -23,6 +23,7 @@ import android.app.admin.DevicePolicyManager;
import android.app.admin.IDevicePolicyManager;
import android.app.contentsuggestions.ContentSuggestionsManager;
import android.app.contentsuggestions.IContentSuggestionsManager;
import android.app.job.JobSchedulerFrameworkInitializer;
import android.app.prediction.AppPredictionManager;
import android.app.role.RoleControllerManager;
import android.app.role.RoleManager;
@@ -153,7 +154,6 @@ import android.os.health.SystemHealthManager;
import android.os.image.DynamicSystemManager;
import android.os.image.IDynamicSystemService;
import android.os.storage.StorageManager;
import android.telephony.TelephonyRegistryManager;
import android.permission.PermissionControllerManager;
import android.permission.PermissionManager;
import android.print.IPrintManager;
@@ -167,6 +167,7 @@ import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.TelephonyRegistryManager;
import android.telephony.euicc.EuiccCardManager;
import android.telephony.euicc.EuiccManager;
import android.telephony.ims.RcsMessageManager;
@@ -1298,6 +1299,9 @@ public final class SystemServiceRegistry {
IBatteryStats.Stub.asInterface(b));
}});
//CHECKSTYLE:ON IndentationCheck
JobSchedulerFrameworkInitializer.initialize();
DeviceIdleFrameworkInitializer.initialize();
}
/**