Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b217b7 authored Oct 05, 2021 by Michal Olech

[CEC Configuration] Switch HDMI_SYSTEM_AUDIO_CONTROL_ENABLED to SharefPrefs

Test: manual test
Change-Id: Iacca003274238a80720d7abddadcc0d26b34f99f
Bug: 175381065

parent 06e13bdb

core/java/android/provider/Settings.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -11049,17 +11049,6 @@ public final class Settings {
		@Readable
		public static final String HDMI_CONTROL_ENABLED = "hdmi_control_enabled";

		/**
		* Whether HDMI System Audio Control feature is enabled. If enabled, TV will try to turn on
		* system audio mode if there's a connected CEC-enabled AV Receiver. Then audio stream will
		* be played on AVR instead of TV spaeker. If disabled, the system audio mode will never be
		* activated.
		* @hide
		*/
		@Readable
		public static final String HDMI_SYSTEM_AUDIO_CONTROL_ENABLED =
		"hdmi_system_audio_control_enabled";

		/**
		* Whether TV will automatically turn on upon reception of the CEC command
		* <Text View On> or <Image View On>. (0 = false, 1 = true)

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -804,9 +804,6 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Global.HDMI_CONTROL_ENABLED,
		GlobalSettingsProto.Hdmi.CONTROL_ENABLED);
		dumpSetting(s, p,
		Settings.Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED,
		GlobalSettingsProto.Hdmi.SYSTEM_AUDIO_CONTROL_ENABLED);
		dumpSetting(s, p,
		Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED,
		GlobalSettingsProto.Hdmi.CONTROL_AUTO_WAKEUP_ENABLED);

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -303,7 +303,6 @@ public class SettingsBackupTest {
		Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED,
		Settings.Global.HDMI_CONTROL_ENABLED,
		Settings.Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP,
		Settings.Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED,
		Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,
		Settings.Global.HIDDEN_API_POLICY,
		Settings.Global.FORCE_NON_DEBUGGABLE_FINAL_BUILD_FOR_COMPAT,

services/core/java/com/android/server/hdmi/HdmiCecConfig.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -530,7 +530,7 @@ public class HdmiCecConfig {
		case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST:
		return STORAGE_SHARED_PREFS;
		case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL:
		return STORAGE_GLOBAL_SETTINGS;
		return STORAGE_SHARED_PREFS;
		case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING:
		return STORAGE_SHARED_PREFS;
		case HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY:
		@@ -571,7 +571,7 @@ public class HdmiCecConfig {
		case HdmiControlManager.CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST:
		return setting.getName();
		case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL:
		return Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED;
		return setting.getName();
		case HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING:
		return setting.getName();
		case HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY: