Merge "Cleanup and simplify MediaDevice-related classes" into main (4137fdcb) · Commits · e / os / android_frameworks_base

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

+7 −12

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@ package com.android.settingslib.media;

		import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.bluetooth.BluetoothClass;
		import android.bluetooth.BluetoothDevice;
		import android.bluetooth.BluetoothHearingAid;
		@@ -37,21 +39,14 @@ public class BluetoothMediaDevice extends MediaDevice {

		private static final String TAG = "BluetoothMediaDevice";

		private CachedBluetoothDevice mCachedDevice;
		private final CachedBluetoothDevice mCachedDevice;
		private final AudioManager mAudioManager;

		BluetoothMediaDevice(
		Context context,
		CachedBluetoothDevice device,
		MediaRoute2Info info) {
		this(context, device, info, null);
		}

		BluetoothMediaDevice(
		Context context,
		CachedBluetoothDevice device,
		MediaRoute2Info info,
		RouteListingPreference.Item item) {
		@NonNull Context context,
		@NonNull CachedBluetoothDevice device,
		@Nullable MediaRoute2Info info,
		@Nullable RouteListingPreference.Item item) {
		super(context, info, item);
		mCachedDevice = device;
		mAudioManager = context.getSystemService(AudioManager.class);

+5 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.settingslib.media;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.Context;
		import android.graphics.drawable.Drawable;
		import android.media.MediaRoute2Info;
		@@ -32,9 +34,9 @@ public class ComplexMediaDevice extends MediaDevice {
		private final String mSummary = "";

		ComplexMediaDevice(
		Context context,
		MediaRoute2Info info,
		RouteListingPreference.Item item) {
		@NonNull Context context,
		@NonNull MediaRoute2Info info,
		@Nullable RouteListingPreference.Item item) {
		super(context, info, item);
		}

+5 −7

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@ import static android.media.MediaRoute2Info.TYPE_REMOTE_TABLET;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_TABLET_DOCKED;
		import static android.media.MediaRoute2Info.TYPE_REMOTE_TV;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.Context;
		import android.graphics.drawable.Drawable;
		import android.media.MediaRoute2Info;
		@@ -43,17 +45,13 @@ public class InfoMediaDevice extends MediaDevice {
		private static final String TAG = "InfoMediaDevice";

		InfoMediaDevice(
		Context context,
		MediaRoute2Info info,
		RouteListingPreference.Item item) {
		@NonNull Context context,
		@NonNull MediaRoute2Info info,
		@Nullable RouteListingPreference.Item item) {
		super(context, info, item);
		initDeviceRecord();
		}

		InfoMediaDevice(Context context, MediaRoute2Info info) {
		this(context, info, null);
		}

		@Override
		public String getName() {
		return mRouteInfo.getName().toString();

+2 −2

Original line number	Diff line number	Diff line
		@@ -570,7 +570,7 @@ public class LocalMediaManager implements BluetoothCallback {
		final CachedBluetoothDevice cachedDevice =
		cachedDeviceManager.findDevice(device);
		if (isBondedMediaDevice(cachedDevice) && isMutingExpectedDevice(cachedDevice)) {
		return new BluetoothMediaDevice(mContext, cachedDevice, null);
		return new BluetoothMediaDevice(mContext, cachedDevice, null, /* item */ null);
		}
		}
		return null;
		@@ -617,7 +617,7 @@ public class LocalMediaManager implements BluetoothCallback {
		mDisconnectedMediaDevices.clear();
		for (CachedBluetoothDevice cachedDevice : cachedBluetoothDeviceList) {
		final MediaDevice mediaDevice =
		new BluetoothMediaDevice(mContext, cachedDevice, null);
		new BluetoothMediaDevice(mContext, cachedDevice, null, /* item */ null);
		if (!mMediaDevices.contains(mediaDevice)) {
		cachedDevice.registerCallback(mDeviceAttributeChangeCallback);
		mDisconnectedMediaDevices.add(mediaDevice);

+5 −3

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ import static android.media.RouteListingPreference.Item.SUBTEXT_UNAUTHORIZED;
		import static com.android.settingslib.media.LocalMediaManager.MediaDeviceState.STATE_SELECTED;
		import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		import android.content.Context;
		import android.graphics.drawable.Drawable;
		@@ -123,9 +125,9 @@ public abstract class MediaDevice implements Comparable<MediaDevice> {
		protected final RouteListingPreference.Item mItem;

		MediaDevice(
		Context context,
		MediaRoute2Info info,
		RouteListingPreference.Item item) {
		@NonNull Context context,
		@Nullable MediaRoute2Info info,
		@Nullable RouteListingPreference.Item item) {
		mContext = context;
		mRouteInfo = info;
		mItem = item;