Snap for 6626136 from 47deb4411f828c6a65ec893040f7d5a33870e051 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release

Change-Id: I886784fc2dc7d5f1f60b61d3b7e25416ea60732c

1 files changed, 13 insertions, 2 deletions

diff --git a/src/com/android/internal/car/CarServiceHelperService.java b/src/com/android/internal/car/CarServiceHelperService.java
index d2d6fea..cd3c4f9 100644
--- a/src/com/android/internal/car/CarServiceHelperService.java
+++ b/src/com/android/internal/car/CarServiceHelperService.java
@@ -76,7 +76,6 @@ import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.car.ExternalConstants.ICarConstants;
 import com.android.internal.os.IResultReceiver;
-import com.android.server.SystemServerInitThreadPool;
 import com.android.server.SystemService;
 import com.android.server.Watchdog;
 import com.android.server.am.ActivityManagerService;
@@ -899,7 +898,19 @@ public class CarServiceHelperService extends SystemService {
 
     @VisibleForTesting
     void runAsync(Runnable r) {
-        SystemServerInitThreadPool.submit(r, "CarServiceHelperManagePreCreatedUsers");
+        // We cannot use SystemServerInitThreadPool because user pre-creation can take too long,
+        // which would crash the SystemServer on SystemServerInitThreadPool.shutdown();
+        String threadName = TAG + ".AsyncTask";
+        Slog.i(TAG, "Starting thread " + threadName);
+        new Thread(() -> {
+            try {
+                r.run();
+                Slog.i(TAG, "Finishing thread " + threadName);
+            } catch (RuntimeException e) {
+                Slog.e(TAG, "runAsync() failed", e);
+                throw e;
+            }
+        }, threadName).start();
     }
 
     @Nullable