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

2019-08-22 22:00:51 +00:00
parent 8247b5f5a6 344555b06e
commit f4fc3e2693
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