commit 85daee827e006652c64eedac00c4fb898c996950
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Nov 22 00:19:09 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Nov 22 00:19:09 2024 +0000
tree 2907f4867eaee898217b37ebe70bcc6e9ce9f8af
parent f62b91abbe29e00013ddbcd501cb3be8e3f0fe75
parent b55fe920674b1f43b56330ffea52b38b176e5e21

Snap for 12695596 from b55fe920674b1f43b56330ffea52b38b176e5e21 to 25Q1-release

Change-Id: I5cfe67e919e5f9c99eddeec8dfc646bb20112737

src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java

diff --git a/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java b/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
index 176e479..4f0aa89 100644
--- a/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
+++ b/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
@@ -308,19 +308,19 @@
         mFeatureFlags = featureFlags;
         if (bluetoothAdapter != null) {
             mBluetoothAdapter = bluetoothAdapter;
-            if (mFeatureFlags.useRefactoredAudioRouteSwitching()) {
-                mBluetoothHeadsetFuture = new CompletableFuture<>();
-            }
             bluetoothAdapter.getProfileProxy(context, mBluetoothProfileServiceListener,
                     BluetoothProfile.HEADSET);
             bluetoothAdapter.getProfileProxy(context, mBluetoothProfileServiceListener,
                     BluetoothProfile.HEARING_AID);
             bluetoothAdapter.getProfileProxy(context, mBluetoothProfileServiceListener,
                     BluetoothProfile.LE_AUDIO);
-            mAudioManager = context.getSystemService(AudioManager.class);
-            mExecutor = context.getMainExecutor();
-            mCommunicationDeviceTracker = communicationDeviceTracker;
         }
+        if (mFeatureFlags.useRefactoredAudioRouteSwitching()) {
+            mBluetoothHeadsetFuture = new CompletableFuture<>();
+        }
+        mAudioManager = context.getSystemService(AudioManager.class);
+        mExecutor = context.getMainExecutor();
+        mCommunicationDeviceTracker = communicationDeviceTracker;
     }
 
     public void setBluetoothRouteManager(BluetoothRouteManager brm) {