Merge "Fix Handling of user switching for headless user 0 model." into qt-qpr1-dev

am: f4fc3e2693 Change-Id: Ibf3308822d6d54f21f135cc8fe289eb5cf1ffa61
2019-08-22 15:16:05 -07:00
parent e9f236906d f4fc3e2693
commit aba33916d7
1 changed files with 5 additions and 2 deletions
--- a/services/core/java/com/android/server/BluetoothService.java
+++ b/services/core/java/com/android/server/BluetoothService.java
@@ -54,8 +54,11 @@ class BluetoothService extends SystemService {

    @Override
    public void onSwitchUser(int userHandle) {
-        initialize();
-        mBluetoothManagerService.handleOnSwitchUser(userHandle);
+        if (!mInitialized) {
+            initialize();
+        } else {
+            mBluetoothManagerService.handleOnSwitchUser(userHandle);
+        }
    }

    @Override