path: root/patch/frameworks#base#0001.patch (plain)
blob: 5df96a517d6fde996978fb8584eac1dea86a106d

1	From 787a233d2b30b7aecc795d7a46d20b649cdbd033 Mon Sep 17 00:00:00 2001
2	From: Chaomin Zheng <chaomin.zheng@amlogic.com>
3	Date: Wed, 5 Jul 2017 18:59:38 +0800
4	Subject: [PATCH] PD #146924:remove HDMI/SPDIF device from fixed volume
5	devices
6
7	Change-Id: Ib61a667204ebde2f4daa7f2043ebd6eecd18783c
8	---
9	.../com/android/server/audio/AudioService.java | 6 +++---
10	1 file changed, 3 insertions(+), 3 deletions(-)
11
12	diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
13	index e5c3106..f1c9255 100644
14	--- a/services/core/java/com/android/server/audio/AudioService.java
15	+++ b/services/core/java/com/android/server/audio/AudioService.java
16	@@ -546,11 +546,11 @@ public class AudioService extends IAudioService.Stub
17	= new RemoteCallbackList<IAudioRoutesObserver>();
18
19	// Devices for which the volume is fixed and VolumePanel slider should be disabled
20	- int mFixedVolumeDevices = AudioSystem.DEVICE_OUT_HDMI |
21	+ int mFixedVolumeDevices = //AudioSystem.DEVICE_OUT_HDMI |
22	AudioSystem.DEVICE_OUT_DGTL_DOCK_HEADSET |
23	AudioSystem.DEVICE_OUT_ANLG_DOCK_HEADSET |
24	AudioSystem.DEVICE_OUT_HDMI_ARC |
25	- AudioSystem.DEVICE_OUT_SPDIF |
26	+ //AudioSystem.DEVICE_OUT_SPDIF |
27	AudioSystem.DEVICE_OUT_AUX_LINE;
28	int mFullVolumeDevices = 0;
29
30	@@ -5402,7 +5402,7 @@ public class AudioService extends IAudioService.Stub
31	}
32	// Television devices without CEC service apply software volume on HDMI output
33	if (isPlatformTelevision() && ((device & AudioSystem.DEVICE_OUT_HDMI) != 0)) {
34	- mFixedVolumeDevices |= AudioSystem.DEVICE_OUT_HDMI;
35	+ //mFixedVolumeDevices |= AudioSystem.DEVICE_OUT_HDMI;
36	checkAllFixedVolumeDevices();
37	if (mHdmiManager != null) {
38	synchronized (mHdmiManager) {
39	--
40	1.7.9.5
41
42