Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Assign a BluetoothAdapter on creation of LMM" into rvc-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2020-03-17 13:04:21 +00:00
committed by Android (Google) Code Review
parent 099927dc5d e731634e1f
commit 7d528431b9
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
View File

@@ -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();
}
/**

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

@@ -113,7 +113,6 @@ public class LocalMediaManagerTest {
TEST_PACKAGE_NAME);
mLocalMediaManager = new LocalMediaManager(mContext, mLocalBluetoothManager,
mInfoMediaManager, "com.test.packagename");
mLocalMediaManager.mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
}
@Test