Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d573db5b authored by Antony Sargent's avatar Antony Sargent
Browse files

Fix a race condition in the A2dpProfile constructor 

When constructing A2dpProfile objects, we were creating an
A2dpServiceListener before initializing the mWrapperFactory instance
variable that it depended on. If the onServiceConnected callback happens
immediately after the listener is created, we'd get a null pointer
exception. The fix is to move initialization of mWrapperFactory up before
the construction of the A2dpServiceListener.

Bug: 38391718
Test: run boot tests
Change-Id: Ib0be947099862b19da7737b54b99b944241b605f
parent 95cf170c

packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -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