Merge "Assign a BluetoothAdapter on creation of LMM" into rvc-dev (7d528431) · Commits · e / os / android_frameworks_base

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

		/**

+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