Delay Bluetooth Start

If bluetooth is started too early, it will need to be restarted to
change its gid.
By delaying the bluetooth start after the OnUserStarting we ensure the
permissions are already set

Fix: 232740613
Test: build & flash with wipe. Check log at first startup
Tag: #refactor
Ignore-AOSP-First: will be push on aosp next
Change-Id: Ifde1348baad5802276679ecc24bc8ae458d02fe6

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