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
(cherry picked from commit e731634e1fc7644f3e8bfd1c0e9451f12602815c)
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
index 44b481d..9ae9b4a4 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
@@ -95,6 +95,15 @@
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 @@
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();
}
/**
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java
index f825ec5..559187d 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java
@@ -113,7 +113,6 @@
TEST_PACKAGE_NAME);
mLocalMediaManager = new LocalMediaManager(mContext, mLocalBluetoothManager,
mInfoMediaManager, "com.test.packagename");
- mLocalMediaManager.mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
}
@Test