Merge "Remove unused parameter (package name) from MediaDevice classes" into main (f9b479a4) · Commits · e / os / android_frameworks_base

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -42,18 +42,16 @@ public class BluetoothMediaDevice extends MediaDevice {
		BluetoothMediaDevice(
		Context context,
		CachedBluetoothDevice device,
		MediaRoute2Info info,
		String packageName) {
		this(context, device, info, packageName, null);
		MediaRoute2Info info) {
		this(context, device, info, null);
		}

		BluetoothMediaDevice(
		Context context,
		CachedBluetoothDevice device,
		MediaRoute2Info info,
		String packageName,
		RouteListingPreference.Item item) {
		super(context, info, packageName, item);
		super(context, info, item);
		mCachedDevice = device;
		mAudioManager = context.getSystemService(AudioManager.class);
		initDeviceRecord();

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -34,9 +34,8 @@ public class ComplexMediaDevice extends MediaDevice {
		ComplexMediaDevice(
		Context context,
		MediaRoute2Info info,
		String packageName,
		RouteListingPreference.Item item) {
		super(context, info, packageName, item);
		super(context, info, item);
		}

		// MediaRoute2Info.getName was made public on API 34, but exists since API 30.

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -45,14 +45,13 @@ public class InfoMediaDevice extends MediaDevice {
		InfoMediaDevice(
		Context context,
		MediaRoute2Info info,
		String packageName,
		RouteListingPreference.Item item) {
		super(context, info, packageName, item);
		super(context, info, item);
		initDeviceRecord();
		}

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

		@Override

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

+3 −7

Original line number	Diff line number	Diff line
		@@ -383,7 +383,7 @@ public abstract class InfoMediaManager extends MediaManager {
		for (MediaRoute2Info route : getSelectableRoutes(info)) {
		deviceList.add(
		new InfoMediaDevice(
		mContext, route, mPackageName, mPreferenceItemMap.get(route.getId())));
		mContext, route, mPreferenceItemMap.get(route.getId())));
		}
		return deviceList;
		}
		@@ -410,7 +410,7 @@ public abstract class InfoMediaManager extends MediaManager {
		for (MediaRoute2Info route : getDeselectableRoutes(info)) {
		deviceList.add(
		new InfoMediaDevice(
		mContext, route, mPackageName, mPreferenceItemMap.get(route.getId())));
		mContext, route, mPreferenceItemMap.get(route.getId())));
		Log.d(TAG, route.getName() + " is deselectable for " + mPackageName);
		}
		return deviceList;
		@@ -434,7 +434,7 @@ public abstract class InfoMediaManager extends MediaManager {
		for (MediaRoute2Info route : getSelectedRoutes(info)) {
		deviceList.add(
		new InfoMediaDevice(
		mContext, route, mPackageName, mPreferenceItemMap.get(route.getId())));
		mContext, route, mPreferenceItemMap.get(route.getId())));
		}
		return deviceList;
		}
		@@ -633,7 +633,6 @@ public abstract class InfoMediaManager extends MediaManager {
		new InfoMediaDevice(
		mContext,
		route,
		mPackageName,
		mPreferenceItemMap.get(route.getId()));
		break;
		case TYPE_BUILTIN_SPEAKER:
		@@ -650,7 +649,6 @@ public abstract class InfoMediaManager extends MediaManager {
		new PhoneMediaDevice(
		mContext,
		route,
		mPackageName,
		mPreferenceItemMap.getOrDefault(route.getId(), null));
		break;
		case TYPE_HEARING_AID:
		@@ -666,7 +664,6 @@ public abstract class InfoMediaManager extends MediaManager {
		mContext,
		cachedDevice,
		route,
		mPackageName,
		mPreferenceItemMap.getOrDefault(route.getId(), null));
		}
		break;
		@@ -675,7 +672,6 @@ public abstract class InfoMediaManager extends MediaManager {
		new ComplexMediaDevice(
		mContext,
		route,
		mPackageName,
		mPreferenceItemMap.get(route.getId()));
		break;
		default:

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

+2 −2

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