diff options
| author | 2024-01-05 12:59:16 +0000 | |
|---|---|---|
| committer | 2024-01-05 12:59:16 +0000 | |
| commit | e5d49414df1ed5d4102c830d6c0b322691dce6cb (patch) | |
| tree | 5e6adde743c53f031f279493c4e9af237e1d8600 | |
| parent | a349921645d7c3991cd4e4d85416df45c70fb279 (diff) | |
| parent | a9ede36fac28b8215f02d2ab38162d06bcadbc6b (diff) | |
Merge "not unmute when disconnect hdmi_out [Audio]" into main am: a9ede36fac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2732673
Change-Id: I1e2f2f3c2d04507f0029a00f98b70f7ea37cabcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 39d9b45bb22d..e9acce6ecb2b 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -7629,7 +7629,6 @@ public class AudioService extends IAudioService.Stub DEVICE_MEDIA_UNMUTED_ON_PLUG_SET.addAll(AudioSystem.DEVICE_OUT_ALL_A2DP_SET); DEVICE_MEDIA_UNMUTED_ON_PLUG_SET.addAll(AudioSystem.DEVICE_OUT_ALL_BLE_SET); DEVICE_MEDIA_UNMUTED_ON_PLUG_SET.addAll(AudioSystem.DEVICE_OUT_ALL_USB_SET); - DEVICE_MEDIA_UNMUTED_ON_PLUG_SET.add(AudioSystem.DEVICE_OUT_HDMI); } /** only public for mocking/spying, do not call outside of AudioService */ |