Merge "Fix a race condition in the A2dpProfile constructor" into oc-dev

am: 8d87842690 Change-Id: Idbb41ac149976073add1f03e9aa3d888d36c999d
2017-05-18 16:46:08 +00:00
parent 0cc01b5bc2 8d87842690
commit 81877dbb79
1 changed files with 1 additions and 1 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
@@ -101,9 +101,9 @@ public class A2dpProfile implements LocalBluetoothProfile {
        mLocalAdapter = adapter;
        mDeviceManager = deviceManager;
        mProfileManager = profileManager;
+        mWrapperFactory = new BluetoothA2dpWrapperImpl.Factory();
        mLocalAdapter.getProfileProxy(context, new A2dpServiceListener(),
                BluetoothProfile.A2DP);
-        mWrapperFactory = new BluetoothA2dpWrapperImpl.Factory();
    }

    @VisibleForTesting