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

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

Merge "Fixed when SystemServerInitThreadPool.shutdown() is called." into... 

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

Change-Id: Ia049c7abc7baae8e27832efe161fa0960bb53b5d
parents e285b727 ab6d4435

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

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

    /**

     * Shuts it down.

     * 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() {

    static void shutdown() {

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

        synchronized (LOCK) {

        synchronized (LOCK) {

            TimingsTraceAndSlog t = new TimingsTraceAndSlog();

            TimingsTraceAndSlog t = new TimingsTraceAndSlog();

            t.traceBegin("WaitInitThreadPoolShutdown");

            t.traceBegin("WaitInitThreadPoolShutdown");

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

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

        if (phase == SystemService.PHASE_BOOT_COMPLETED) {

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

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

            t.logDuration("TotalBootTime", totalBootTime);

            t.logDuration("TotalBootTime", totalBootTime);

            SystemServerInitThreadPool.shutdown();

        }

        }

    }

    }

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

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

            startBootstrapServices(t);

            startCoreServices(t);

            startCoreServices(t);

            startOtherServices(t);

            startOtherServices(t);

            SystemServerInitThreadPool.shutdown();

        } catch (Throwable ex) {

        } catch (Throwable ex) {

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

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

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

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