diff options
3 files changed, 9 insertions, 5 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java index 24acf8a320a5..c45e8e48b618 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java @@ -23,6 +23,7 @@ import android.bluetooth.BluetoothDevice; import android.content.ComponentName; import android.content.Context; import android.graphics.drawable.Drawable; +import android.media.AudioDeviceAttributes; import android.media.AudioManager; import android.media.RoutingSessionInfo; import android.os.Build; @@ -566,9 +567,11 @@ public class LocalMediaManager implements BluetoothCallback { } private boolean isMutingExpectedDevice(CachedBluetoothDevice cachedDevice) { - return mAudioManager.getMutingExpectedDevice() != null - && cachedDevice.getAddress().equals( - mAudioManager.getMutingExpectedDevice().getAddress()); + AudioDeviceAttributes mutingExpectedDevice = mAudioManager.getMutingExpectedDevice(); + if (mutingExpectedDevice == null || cachedDevice == null) { + return false; + } + return cachedDevice.getAddress().equals(mutingExpectedDevice.getAddress()); } private List<MediaDevice> buildDisconnectedBluetoothDevice() { diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java index a174b459272f..19b32e93274b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java @@ -117,7 +117,7 @@ public class MediaOutputDialog extends MediaOutputBaseDialog { @Override public CharSequence getStopButtonText() { - int resId = R.string.keyboard_key_media_stop; + int resId = R.string.media_output_dialog_button_stop_casting; if (isBroadcastSupported() && mMediaOutputController.isPlaying() && !mMediaOutputController.isBluetoothLeBroadcastEnabled()) { resId = R.string.media_output_broadcast; diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java index 9ecc63ca9232..c3fabfefef58 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java @@ -306,7 +306,8 @@ public class MediaOutputDialogTest extends SysuiTestCase { @Test public void getStopButtonText_notSupportsBroadcast_returnsDefaultText() { - String stopText = mContext.getText(R.string.keyboard_key_media_stop).toString(); + String stopText = mContext.getText( + R.string.media_output_dialog_button_stop_casting).toString(); MediaOutputController mockMediaOutputController = mock(MediaOutputController.class); when(mockMediaOutputController.isBroadcastSupported()).thenReturn(false); |