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

am: f4fc3e2693

Change-Id: Ibf3308822d6d54f21f135cc8fe289eb5cf1ffa61

1 files changed, 5 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/BluetoothService.java b/services/core/java/com/android/server/BluetoothService.java
index 5c5b477352b1..6a6ddc84be49 100644
--- 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