diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-03-23 18:33:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-23 18:33:10 +0000 |
| commit | 356176177633a619f4a916248536e4e7a5fb9b2e (patch) | |
| tree | 32893c6fc11bae091e7ad4daa0e53c9e9757f726 /services/java | |
| parent | 2a16460c7c914729e9c256ce39d681524d53b7dc (diff) | |
| parent | 05199e83a460683e2af06212b0dc7310647e8502 (diff) | |
| download | frameworks_base-356176177633a619f4a916248536e4e7a5fb9b2e.zip frameworks_base-356176177633a619f4a916248536e4e7a5fb9b2e.tar.gz frameworks_base-356176177633a619f4a916248536e4e7a5fb9b2e.tar.bz2 | |
Merge "Set the appliance (tv/watch) in the configuration earlier"
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index bcd8d42..ae2c54b 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -564,6 +564,10 @@ public final class SystemServer { } } + // We start this here so that we update our configuration to set watch or television + // as appropriate. + mSystemServiceManager.startService(UiModeManagerService.class); + try { mPackageManagerService.performBootDexOpt(); } catch (Throwable e) { @@ -843,8 +847,6 @@ public final class SystemServer { mSystemServiceManager.startService(TwilightService.class); - mSystemServiceManager.startService(UiModeManagerService.class); - mSystemServiceManager.startService(JobSchedulerService.class); if (!disableNonCoreServices) { |