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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-11 22:04:46 +00:00
committed by Android (Google) Code Review
parent 50ec69fa09 fc5304075e
commit 3ce5a9b85b
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/SystemServerInitThreadPool.java
View File

@@ -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");

1
services/core/java/com/android/server/SystemServiceManager.java
View File

@@ -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();
} }
} }

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

@@ -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);