diff --git a/services/core/java/com/android/server/SystemServerInitThreadPool.java b/services/core/java/com/android/server/SystemServerInitThreadPool.java
index 1ce655618028b..ff6a5375565a9 100644
--- a/services/core/java/com/android/server/SystemServerInitThreadPool.java
+++ b/services/core/java/com/android/server/SystemServerInitThreadPool.java
@@ -45,7 +45,8 @@ public class SystemServerInitThreadPool {
 
     private static SystemServerInitThreadPool sInstance;
 
-    private ExecutorService mService = ConcurrentUtils.newFixedThreadPool(4,
+    private ExecutorService mService = ConcurrentUtils.newFixedThreadPool(
+            Runtime.getRuntime().availableProcessors(),
             "system-server-init-thread", Process.THREAD_PRIORITY_FOREGROUND);
 
     private List<String> mPendingTasks = new ArrayList<>();