Snap for 6533464 from c2166e5e050755eafbded5bcb6e5509197627461 to sdk-release
Change-Id: Idd67faafa1384d822bf03133e43dfb31aff54a68
diff --git a/srcs/Android.bp b/srcs/Android.bp
index 091fd63..37bb396 100644
--- a/srcs/Android.bp
+++ b/srcs/Android.bp
@@ -18,4 +18,10 @@
srcs: ["**/*.sysprop"],
property_owner: "Platform",
api_packages: ["android.sysprop"],
+
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.art.release",
+ "com.android.art.debug",
+ ],
}
diff --git a/srcs/android/sysprop/HdmiProperties.sysprop b/srcs/android/sysprop/HdmiProperties.sysprop
index e78977e..c266202 100644
--- a/srcs/android/sysprop/HdmiProperties.sysprop
+++ b/srcs/android/sysprop/HdmiProperties.sysprop
@@ -27,9 +27,48 @@
# Set this to true to enable 'Set Menu Language' CEC feature.
prop {
- api_name: "set_menu_language"
+ api_name: "set_menu_language_enabled"
type: Boolean
scope: Internal
access: Readonly
- prop_name: "ro.hdmi.set_menu_language"
-}
\ No newline at end of file
+ prop_name: "ro.hdmi.cec.source.set_menu_language.enabled"
+}
+
+# When ARC is initiated, this port will be used to turn on ARC.
+prop {
+ api_name: "arc_port"
+ type: String
+ scope: Internal
+ access: Readonly
+ prop_name: "ro.hdmi.cec.audio.arc_port.config"
+}
+
+# True means enabling muting logic.
+# False means never mute device.
+prop {
+ api_name: "system_audio_mode_muting"
+ type: Boolean
+ scope: Internal
+ access: Readonly
+ prop_name: "ro.hdmi.cec.audio.system_audio_mode_muting.enabled"
+}
+
+# True means CEC audio device should forward volume keys when system audio mode is off.
+# Default is false.
+prop {
+ api_name: "forward_volume_keys_when_system_audio_mode_off"
+ type: Boolean
+ scope: Internal
+ access: Readonly
+ prop_name: "ro.hdmi.cec.audio.forward_volume_keys_when_system_audio_mode_off.enabled"
+}
+
+# True means the current device is a cec switch device.
+# Default is false.
+prop {
+ api_name: "is_switch"
+ type: Boolean
+ scope: Internal
+ access: Readonly
+ prop_name: "ro.hdmi.cec.source.is_switch.enabled."
+}
diff --git a/srcs/android/sysprop/TelephonyProperties.sysprop b/srcs/android/sysprop/TelephonyProperties.sysprop
index 9282c0a..15999e7 100644
--- a/srcs/android/sysprop/TelephonyProperties.sysprop
+++ b/srcs/android/sysprop/TelephonyProperties.sysprop
@@ -449,9 +449,9 @@
prop {
api_name: "max_active_modems"
type: Integer
- scope: Internal
+ scope: Public
access: Readonly
- prop_name: "ro.telephony.max.active.modems"
+ prop_name: "telephony.active_modems.max_count"
}
#
diff --git a/srcs/api/PlatformProperties-current.txt b/srcs/api/PlatformProperties-current.txt
index 817d675..fbf5036 100644
--- a/srcs/api/PlatformProperties-current.txt
+++ b/srcs/api/PlatformProperties-current.txt
@@ -131,15 +131,36 @@
props {
module: "android.sysprop.HdmiProperties"
prop {
+ api_name: "arc_port"
+ type: String
+ scope: Internal
+ prop_name: "ro.hdmi.cec.audio.arc_port.config"
+ }
+ prop {
api_name: "device_type"
type: IntegerList
scope: Internal
prop_name: "ro.hdmi.device_type"
}
prop {
- api_name: "set_menu_language"
+ api_name: "forward_volume_keys_when_system_audio_mode_off"
scope: Internal
- prop_name: "ro.hdmi.set_menu_language"
+ prop_name: "ro.hdmi.cec.audio.forward_volume_keys_when_system_audio_mode_off.enabled"
+ }
+ prop {
+ api_name: "is_switch"
+ scope: Internal
+ prop_name: "ro.hdmi.cec.source.is_switch.enabled."
+ }
+ prop {
+ api_name: "set_menu_language_enabled"
+ scope: Internal
+ prop_name: "ro.hdmi.cec.source.set_menu_language.enabled"
+ }
+ prop {
+ api_name: "system_audio_mode_muting"
+ scope: Internal
+ prop_name: "ro.hdmi.cec.audio.system_audio_mode_muting.enabled"
}
}
props {
@@ -287,8 +308,7 @@
prop {
api_name: "max_active_modems"
type: Integer
- scope: Internal
- prop_name: "ro.telephony.max.active.modems"
+ prop_name: "telephony.active_modems.max_count"
}
prop {
api_name: "mobile_data"
