diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-02-11 04:12:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-11 04:12:02 +0000 |
| commit | 1b51c9cb96fe2a0818289857a016521eed1ec183 (patch) | |
| tree | 184ecb06938a3a2a47d669ca5dd17e25148d9c46 /services/java/com/android/server/SystemServer.java | |
| parent | 312ba86b476fa1d83864a7d465135cc9a4e94ad8 (diff) | |
| parent | b880d880c6cd989eacc28c365fc9a41d31900da1 (diff) | |
| download | frameworks_base-1b51c9cb96fe2a0818289857a016521eed1ec183.zip frameworks_base-1b51c9cb96fe2a0818289857a016521eed1ec183.tar.gz frameworks_base-1b51c9cb96fe2a0818289857a016521eed1ec183.tar.bz2 | |
Merge "Make SystemService constructor take a Context." into klp-modular-dev
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 269c056..f941ffe 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -106,9 +106,9 @@ public final class SystemServer { * them from the build system somehow. */ private static final String BACKUP_MANAGER_SERVICE_CLASS = - "com.android.server.backup.BackupManagerSystemService"; + "com.android.server.backup.BackupManagerService$Lifecycle"; private static final String DEVICE_POLICY_MANAGER_SERVICE_CLASS = - "com.android.server.devicepolicy.DevicePolicyManagerSystemService"; + "com.android.server.devicepolicy.DevicePolicyManagerService$Lifecycle"; private static final String APPWIDGET_SERVICE_CLASS = "com.android.server.appwidget.AppWidgetService"; private static final String PRINT_MANAGER_SERVICE_CLASS = @@ -211,6 +211,7 @@ public final class SystemServer { // Create the system service manager. mSystemServiceManager = new SystemServiceManager(mSystemContext); + LocalServices.addService(SystemServiceManager.class, mSystemServiceManager); // Start services. try { |