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

Commit 5ab2f9aa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed when SystemServerInitThreadPool.shutdown() is called." into rvc-dev am: 3ce5a9b8 

Change-Id: I0b4b9ad545f2cebd9edd4adf3259ac34371bb79d
parents 72c7d056 3ce5a9b8

services/core/java/com/android/server/SystemServerInitThreadPool.java

+3 −1
Original line number Diff line number Diff line
@@ -133,9 +133,11 @@ public class SystemServerInitThreadPool { 
    /**

     * Shuts it down.

     *

     * <p>Note:</p> should only be called by {@link SystemServer}.

     * <p>Note:</p> should only be called *after* {@code PHASE_BOOT_COMPLETED} is sent to the

     * {@link SystemService system services}.

     */

    static void shutdown() {

        Slog.d(TAG, "Shutdown requested");

        synchronized (LOCK) {

            TimingsTraceAndSlog t = new TimingsTraceAndSlog();

            t.traceBegin("WaitInitThreadPoolShutdown");

services/core/java/com/android/server/SystemServiceManager.java

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ public class SystemServiceManager { 
        if (phase == SystemService.PHASE_BOOT_COMPLETED) {

            final long totalBootTime = SystemClock.uptimeMillis() - mRuntimeStartUptime;

            t.logDuration("TotalBootTime", totalBootTime);

            SystemServerInitThreadPool.shutdown();

        }

    }

services/java/com/android/server/SystemServer.java

+0 −1
Original line number Diff line number Diff line
@@ -584,7 +584,6 @@ public final class SystemServer { 
            startBootstrapServices(t);

            startCoreServices(t);

            startOtherServices(t);

            SystemServerInitThreadPool.shutdown();

        } catch (Throwable ex) {

            Slog.e("System", "******************************************");

            Slog.e("System", "************ Failure starting system services", ex);