diff options
10 files changed, 46 insertions, 63 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java index cdb87404b016..063807abeb0a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java @@ -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); diff --git a/packages/SettingsLib/src/com/android/settingslib/media/ComplexMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/ComplexMediaDevice.java index 338fb872650c..a87daf90a84f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/ComplexMediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/ComplexMediaDevice.java @@ -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); } diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java index 1347dd131f69..21873ef3aeab 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java @@ -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(); diff --git a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java index cfa825bbb1c4..72a60fbc9fea 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java @@ -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); diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java index 0c4cf769ca90..ce1f29766bed 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java @@ -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; diff --git a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java index ba9180db0887..9eaf8d3838d8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java @@ -29,6 +29,8 @@ import static android.media.MediaRoute2Info.TYPE_WIRED_HEADSET; import static com.android.settingslib.media.MediaDevice.SelectionBehavior.SELECTION_BEHAVIOR_TRANSFER; import android.Manifest; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.Context; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; @@ -40,7 +42,6 @@ import android.media.RouteListingPreference; import android.os.SystemProperties; import android.util.Log; -import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; import com.android.settingslib.R; @@ -100,17 +101,6 @@ public class PhoneMediaDevice extends MediaDevice { R.string.media_transfer_external_device_name); break; case TYPE_HDMI_ARC: - if (isTv) { - String deviceName = getHdmiOutDeviceName(context); - if (deviceName != null) { - name = deviceName; - } else { - name = context.getString(R.string.tv_media_transfer_arc_fallback_title); - } - } else { - name = context.getString(R.string.media_transfer_external_device_name); - } - break; case TYPE_HDMI_EARC: if (isTv) { String deviceName = getHdmiOutDeviceName(context); @@ -130,14 +120,10 @@ public class PhoneMediaDevice extends MediaDevice { return name.toString(); } - PhoneMediaDevice(Context context, MediaRoute2Info info) { - this(context, info, null); - } - PhoneMediaDevice( - Context context, - MediaRoute2Info info, - RouteListingPreference.Item item) { + @NonNull Context context, + @NonNull MediaRoute2Info info, + @Nullable RouteListingPreference.Item item) { super(context, info, item); mDeviceIconUtil = new DeviceIconUtil(mContext); initDeviceRecord(); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaDeviceTest.java index 0665308fdbfb..6647a278a6bd 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaDeviceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaDeviceTest.java @@ -65,7 +65,7 @@ public class InfoMediaDeviceTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mInfoMediaDevice = new InfoMediaDevice(mContext, mRouteInfo); + mInfoMediaDevice = new InfoMediaDevice(mContext, mRouteInfo, /* item */ null); } @Test diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java index ce07fe9fdf0a..c9b35a0ae833 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java @@ -559,7 +559,7 @@ public class InfoMediaManagerTest { routingSessionInfos.add(info); final MediaRoute2Info route2Info = mock(MediaRoute2Info.class); - final MediaDevice device = new InfoMediaDevice(mContext, route2Info); + final MediaDevice device = new InfoMediaDevice(mContext, route2Info, /* item */ null); final List<String> list = new ArrayList<>(); list.add(TEST_ID); @@ -580,7 +580,7 @@ public class InfoMediaManagerTest { routingSessionInfos.add(info); final MediaRoute2Info route2Info = mock(MediaRoute2Info.class); - final MediaDevice device = new InfoMediaDevice(mContext, route2Info); + final MediaDevice device = new InfoMediaDevice(mContext, route2Info, /* item */ null); final List<String> list = new ArrayList<>(); list.add("fake_id"); @@ -602,7 +602,7 @@ public class InfoMediaManagerTest { routingSessionInfos.add(info); final MediaRoute2Info route2Info = mock(MediaRoute2Info.class); - final MediaDevice device = new InfoMediaDevice(mContext, route2Info); + final MediaDevice device = new InfoMediaDevice(mContext, route2Info, /* item */ null); final List<String> list = new ArrayList<>(); list.add(TEST_ID); @@ -623,7 +623,7 @@ public class InfoMediaManagerTest { routingSessionInfos.add(info); final MediaRoute2Info route2Info = mock(MediaRoute2Info.class); - final MediaDevice device = new InfoMediaDevice(mContext, route2Info); + final MediaDevice device = new InfoMediaDevice(mContext, route2Info, /* item */ null); final List<String> list = new ArrayList<>(); list.add("fake_id"); 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 12541bb51cc8..a30d6a787971 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 @@ -135,8 +135,8 @@ public class LocalMediaManagerTest { .when(mInfoMediaManager) .getRoutingSessionsForPackage(); - mInfoMediaDevice1 = spy(new InfoMediaDevice(mContext, mRouteInfo1)); - mInfoMediaDevice2 = new InfoMediaDevice(mContext, mRouteInfo2); + mInfoMediaDevice1 = spy(new InfoMediaDevice(mContext, mRouteInfo1, /* item */ null)); + mInfoMediaDevice2 = new InfoMediaDevice(mContext, mRouteInfo2, /* item */ null); mLocalMediaManager = new LocalMediaManager( mContext, mLocalBluetoothManager, mInfoMediaManager, TEST_PACKAGE_NAME); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java index 098ab162c225..3d16d6f1cd56 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java @@ -171,17 +171,17 @@ public class MediaDeviceTest { mBluetoothMediaDevice1 = new BluetoothMediaDevice( - mContext, mCachedDevice1, mBluetoothRouteInfo1); + mContext, mCachedDevice1, mBluetoothRouteInfo1, /* item */ null); mBluetoothMediaDevice2 = new BluetoothMediaDevice( - mContext, mCachedDevice2, mBluetoothRouteInfo2); + mContext, mCachedDevice2, mBluetoothRouteInfo2, /* item */ null); mBluetoothMediaDevice3 = new BluetoothMediaDevice( - mContext, mCachedDevice3, mBluetoothRouteInfo3); - mInfoMediaDevice1 = new InfoMediaDevice(mContext, mRouteInfo1); - mInfoMediaDevice2 = new InfoMediaDevice(mContext, mRouteInfo2); - mInfoMediaDevice3 = new InfoMediaDevice(mContext, mRouteInfo3); - mPhoneMediaDevice = new PhoneMediaDevice(mContext, mPhoneRouteInfo); + mContext, mCachedDevice3, mBluetoothRouteInfo3, /* item */ null); + mInfoMediaDevice1 = new InfoMediaDevice(mContext, mRouteInfo1, /* item */ null); + mInfoMediaDevice2 = new InfoMediaDevice(mContext, mRouteInfo2, /* item */ null); + mInfoMediaDevice3 = new InfoMediaDevice(mContext, mRouteInfo3, /* item */ null); + mPhoneMediaDevice = new PhoneMediaDevice(mContext, mPhoneRouteInfo, /* item */ null); } @Test @@ -316,7 +316,7 @@ public class MediaDeviceTest { when(phoneRouteInfo.getType()).thenReturn(TYPE_WIRED_HEADPHONES); final PhoneMediaDevice phoneMediaDevice = - new PhoneMediaDevice(mContext, phoneRouteInfo); + new PhoneMediaDevice(mContext, phoneRouteInfo, /* item */ null); mMediaDevices.add(mBluetoothMediaDevice1); mMediaDevices.add(phoneMediaDevice); @@ -332,7 +332,7 @@ public class MediaDeviceTest { when(phoneRouteInfo.getType()).thenReturn(TYPE_WIRED_HEADPHONES); final PhoneMediaDevice phoneMediaDevice = - new PhoneMediaDevice(mContext, phoneRouteInfo); + new PhoneMediaDevice(mContext, phoneRouteInfo, /* item */ null); mMediaDevices.add(mInfoMediaDevice1); mMediaDevices.add(phoneMediaDevice); @@ -483,7 +483,7 @@ public class MediaDeviceTest { public void getFeatures_noRouteInfo_returnEmptyList() { mBluetoothMediaDevice1 = new BluetoothMediaDevice( - mContext, mCachedDevice1, /* MediaRoute2Info */ null); + mContext, mCachedDevice1, /* MediaRoute2Info */ null, /* item */ null); assertThat(mBluetoothMediaDevice1.getFeatures().size()).isEqualTo(0); } |