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

Merge "Delay DropBox until SettingsProvider becomes ready" into pi-dev

Browse Source 
am: 5e61df7a8e

Change-Id: Ic87e82cf9c02e7c42313221613ad793b56f9da7e
This commit is contained in:
Yohei Yukawa
2018-03-16 04:54:12 +00:00
committed by android-build-merger
parent 583d8962a4 5e61df7a8e
commit 0939856ff4
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/SystemServer.java
View File

@@ -685,11 +685,6 @@ public final class SystemServer {
* Starts some essential services that are not tangled up in the bootstrap process. * Starts some essential services that are not tangled up in the bootstrap process.
*/ */
private void startCoreServices() { private void startCoreServices() {
// Records errors and logs, for example wtf()
traceBeginAndSlog("StartDropBoxManager");
mSystemServiceManager.startService(DropBoxManagerService.class);
traceEnd();
traceBeginAndSlog("StartBatteryService"); traceBeginAndSlog("StartBatteryService");
// Tracks the battery level. Requires LightService. // Tracks the battery level. Requires LightService.
mSystemServiceManager.startService(BatteryService.class); mSystemServiceManager.startService(BatteryService.class);
@@ -816,6 +811,13 @@ public final class SystemServer {
SQLiteCompatibilityWalFlags.reset(); SQLiteCompatibilityWalFlags.reset();
traceEnd(); traceEnd();
// Records errors and logs, for example wtf()
// Currently this service indirectly depends on SettingsProvider so do this after
// InstallSystemProviders.
traceBeginAndSlog("StartDropBoxManager");
mSystemServiceManager.startService(DropBoxManagerService.class);
traceEnd();
traceBeginAndSlog("StartVibratorService"); traceBeginAndSlog("StartVibratorService");
vibrator = new VibratorService(context); vibrator = new VibratorService(context);
ServiceManager.addService("vibrator", vibrator); ServiceManager.addService("vibrator", vibrator);