Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[LE Audio] Add BT LE headset check for voice call to update the icon" into tm-qpr-dev am: e094dfde3a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20580288

Change-Id: Ie1a27d0d68a1d3ba778aa30ce02eed2a152e03e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Betty Chang
2022-12-05 10:23:52 +00:00
committed by Automerger Merge Worker
parent 60c604f7de e094dfde3a
commit 5bbb106ced
3 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
View File

@@ -431,6 +431,11 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
AudioManager.DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER |
AudioManager.DEVICE_OUT_BLE_HEADSET)) != 0;
changed |= updateStreamRoutedToBluetoothW(stream, routedToBluetooth);
} else if (stream == AudioManager.STREAM_VOICE_CALL) {
final boolean routedToBluetooth =
(mAudio.getDevicesForStream(AudioManager.STREAM_VOICE_CALL)
& AudioManager.DEVICE_OUT_BLE_HEADSET) != 0;
changed |= updateStreamRoutedToBluetoothW(stream, routedToBluetooth);
}
return changed;
}

9
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
View File

@@ -1771,6 +1771,7 @@ public class VolumeDialogImpl implements VolumeDialog,
if (ss.level == row.requestedLevel) {
row.requestedLevel = -1;
}
final boolean isVoiceCallStream = row.stream == AudioManager.STREAM_VOICE_CALL;
final boolean isA11yStream = row.stream == STREAM_ACCESSIBILITY;
final boolean isRingStream = row.stream == AudioManager.STREAM_RING;
final boolean isSystemStream = row.stream == AudioManager.STREAM_SYSTEM;
@@ -1815,8 +1816,12 @@ public class VolumeDialogImpl implements VolumeDialog,
} else if (isRingSilent || zenMuted) {
iconRes = row.iconMuteRes;
} else if (ss.routedToBluetooth) {
iconRes = isStreamMuted(ss) ? R.drawable.ic_volume_media_bt_mute
: R.drawable.ic_volume_media_bt;
if (isVoiceCallStream) {
iconRes = R.drawable.ic_volume_bt_sco;
} else {
iconRes = isStreamMuted(ss) ? R.drawable.ic_volume_media_bt_mute
: R.drawable.ic_volume_media_bt;
}
} else if (isStreamMuted(ss)) {
iconRes = ss.muted ? R.drawable.ic_volume_media_off : row.iconMuteRes;
} else {

28
packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java
View File

@@ -169,6 +169,34 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase {
LOCK_TASK_MODE_NONE);
}
@Test
public void testVolumeChangeW_deviceOutFromBLEHeadset_doStateChanged() {
mVolumeController.setDeviceInteractive(false);
when(mWakefullnessLifcycle.getWakefulness()).thenReturn(
WakefulnessLifecycle.WAKEFULNESS_AWAKE);
when(mAudioManager.getDevicesForStream(AudioManager.STREAM_VOICE_CALL)).thenReturn(
AudioManager.DEVICE_OUT_BLE_HEADSET);
mVolumeController.onVolumeChangedW(
AudioManager.STREAM_VOICE_CALL, AudioManager.FLAG_SHOW_UI);
verify(mCallback, times(1)).onStateChanged(any());
}
@Test
public void testVolumeChangeW_deviceOutFromA2DP_doStateChanged() {
mVolumeController.setDeviceInteractive(false);
when(mWakefullnessLifcycle.getWakefulness()).thenReturn(
WakefulnessLifecycle.WAKEFULNESS_AWAKE);
when(mAudioManager.getDevicesForStream(AudioManager.STREAM_VOICE_CALL)).thenReturn(
AudioManager.DEVICE_OUT_BLUETOOTH_A2DP);
mVolumeController.onVolumeChangedW(
AudioManager.STREAM_VOICE_CALL, AudioManager.FLAG_SHOW_UI);
verify(mCallback, never()).onStateChanged(any());
}
@Test
public void testOnRemoteVolumeChanged_newStream_noNullPointer() {
MediaSession.Token token = new MediaSession.Token(Process.myUid(), null);