1 files changed, 6 insertions, 2 deletions
diff --git a/service/java/com/android/server/bluetooth/BluetoothService.java b/service/java/com/android/server/bluetooth/BluetoothService.java
index ff6938e5f6..a729f8213a 100644
--- a/service/java/com/android/server/bluetooth/BluetoothService.java
+++ b/service/java/com/android/server/bluetooth/BluetoothService.java
@@ -50,8 +50,12 @@ public class BluetoothService extends SystemService {
         if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {
             publishBinderService(BluetoothAdapter.BLUETOOTH_MANAGER_SERVICE,
                     mBluetoothManagerService);
-        } else if (phase == SystemService.PHASE_ACTIVITY_MANAGER_READY &&
-                !UserManager.isHeadlessSystemUserMode()) {
+        }
+    }
+
+    @Override
+    public void onUserStarting(@NonNull TargetUser user) {
+        if (!UserManager.isHeadlessSystemUserMode()) {
             initialize();
         }
     }