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

Commit e731634e authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Assign a BluetoothAdapter on creation of LMM 

When constructing a LocalMediaManager by passing a LocalBluetoothManager
and a InfoMediaManager, assign the bluetooth adapter to the default.

Fixes: 151580099
Fixes: 151622615
Test: atest LocalMediaManagerTest
Test: manual
Change-Id: I29ac58bc3635901c713e91ab921d59bfbe58fba7
parent 3bdd15fb

packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java

+15 −0
Original line number Diff line number Diff line
@@ -95,6 +95,15 @@ public class LocalMediaManager implements BluetoothCallback { 
        mCallbacks.remove(callback);

    }



    /**

     * Creates a LocalMediaManager with references to given managers.

     *

     * It will obtain a {@link LocalBluetoothManager} by calling

     * {@link LocalBluetoothManager#getInstance} and create an {@link InfoMediaManager} passing

     * that bluetooth manager.

     *

     * It will use {@link BluetoothAdapter#getDefaultAdapter()] for setting the bluetooth adapter.

     */

    public LocalMediaManager(Context context, String packageName, Notification notification) {

        mContext = context;

        mPackageName = packageName;
@@ -110,12 +119,18 @@ public class LocalMediaManager implements BluetoothCallback { 
                new InfoMediaManager(context, packageName, notification, mLocalBluetoothManager);

    }



    /**

     * Creates a LocalMediaManager with references to given managers.

     *

     * It will use {@link BluetoothAdapter#getDefaultAdapter()] for setting the bluetooth adapter.

     */

    public LocalMediaManager(Context context, LocalBluetoothManager localBluetoothManager,

            InfoMediaManager infoMediaManager, String packageName) {

        mContext = context;

        mLocalBluetoothManager = localBluetoothManager;

        mInfoMediaManager = infoMediaManager;

        mPackageName = packageName;

        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

    }



    /**

packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ public class LocalMediaManagerTest { 
                TEST_PACKAGE_NAME);

        mLocalMediaManager = new LocalMediaManager(mContext, mLocalBluetoothManager,

                mInfoMediaManager, "com.test.packagename");

        mLocalMediaManager.mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

    }



    @Test