commit fe61a67bb9a7b82d1fb29c349c9b0b0b245f8c52
author Jinsuk Kim <jinsukkim@google.com> Fri Jul 18 00:24:09 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 17 21:07:39 2014 +0000
tree aa1e898cd39c00c5acb143a7cdf52a596a5198ce
parent abdd154334eced2595d42e17a9dbac242a9af7da
parent 55021797c637c5bd4d828b515b403a29d79ca274

Merge "Remove system audio output option for HdmiControlService" into lmp-dev

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index bc069ca..a64e2a1 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -5154,17 +5154,6 @@
        public static final String HDMI_SYSTEM_AUDIO_ENABLED = "hdmi_system_audio_enabled";
 
        /**
-        * Output of the audio to be used for system audio mode, as defined in AudioSystem.java.
-        * <ul>
-        * <li>DEVICE_OUT_SPDIF</li>
-        * <li>DEVICE_OUT_HDMI_ARC</li>
-        * <li>DEVICE_OUT_LINE</li>
-        * </ul>
-        * @hide
-        */
-       public static final String HDMI_SYSTEM_AUDIO_OUTPUT = "hdmi_system_audio_output";
-
-       /**
         * Whether TV will automatically turn on upon reception of the CEC command
         * &lt;Text View On&gt; or &lt;Image View On&gt;. (0 = false, 1 = true)
         * @hide