diff options
| author | 2024-01-05 13:30:36 +0000 | |
|---|---|---|
| committer | 2024-01-05 13:30:36 +0000 | |
| commit | b1c44e1b04d44a3d586ecd1aedd45813a1f13ab2 (patch) | |
| tree | 7b9d2a63f0e65f973530ec647d5dd044f32f3679 | |
| parent | 24e4de7be378efa08a5a769fe030cbed69a2d065 (diff) | |
| parent | e5d49414df1ed5d4102c830d6c0b322691dce6cb (diff) | |
Merge "not unmute when disconnect hdmi_out [Audio]" into main am: a9ede36fac am: e5d49414df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2732673
Change-Id: Id27e6843cb58cabb335ad836ef1be682a38bf90a
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 255fc909ed63..f805694a7356 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -7656,7 +7656,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 */ |