diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-07-07 04:50:11 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-07-07 04:50:11 -0700 |
| commit | dd6dc18f57235bf19b3886f51c1c91baa5d62ecc (patch) | |
| tree | 57eebc6f0878d2d2aa19ccae6ad8332ecbd4c83d /service/java/com/android/server/bluetooth/BluetoothService.java | |
| parent | 241b2b700fd3cf842291ce13513d6bbb50564560 (diff) | |
| parent | c8523f5c9dfc0d3cf2f3ecc3c7f89326733fb276 (diff) | |
Merge c8523f5c9dfc0d3cf2f3ecc3c7f89326733fb276 on remote branch
Change-Id: Ibd4beb7c71dd436610071aff26ccde92e237dfbd
Diffstat (limited to 'service/java/com/android/server/bluetooth/BluetoothService.java')
| -rw-r--r-- | service/java/com/android/server/bluetooth/BluetoothService.java | 8 |
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(); } } |