Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52f250e0 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Merge "Delay DropBox until SettingsProvider becomes ready" into pi-dev am: 5e61df7a

am: 0939856f

Change-Id: I676576ba7ab3ed86a30f25187eae4be26e9c7085
parents 71d36aa3 0939856f
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -685,11 +685,6 @@ public final class SystemServer {
     * Starts some essential services that are not tangled up in the bootstrap process.
     */
    private void startCoreServices() {
        // Records errors and logs, for example wtf()
        traceBeginAndSlog("StartDropBoxManager");
        mSystemServiceManager.startService(DropBoxManagerService.class);
        traceEnd();

        traceBeginAndSlog("StartBatteryService");
        // Tracks the battery level.  Requires LightService.
        mSystemServiceManager.startService(BatteryService.class);
@@ -816,6 +811,13 @@ public final class SystemServer {
            SQLiteCompatibilityWalFlags.reset();
            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");
            vibrator = new VibratorService(context);
            ServiceManager.addService("vibrator", vibrator);