Merge "Unhide android.media.AudioManager.MODE_IN_COMMUNICATION" (dd688b60) · Commits · e / os / android_frameworks_base

api/current.xml

+12 −1

Original line number	Diff line number	Diff line
		@@ -98978,6 +98978,17 @@
		visibility="public"
		>
		</field>
		<field name="MODE_IN_COMMUNICATION"
		type="int"
		transient="false"
		volatile="false"
		value="3"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="MODE_NORMAL"
		type="int"
		transient="false"
		@@ -248462,7 +248473,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="arg0" type="T">
		<parameter name="t" type="T">
		</parameter>
		</method>
		</interface>

+4 −3

Original line number	Diff line number	Diff line
		@@ -984,7 +984,8 @@ public class AudioManager {
		* application when it places a phone call, as it will cause signals from the radio layer
		* to feed the platform mixer.
		*
		* @param mode the requested audio mode (NORMAL, RINGTONE, IN_CALL or IN_COMMUNICATION).
		* @param mode the requested audio mode ({@link #MODE_NORMAL}, {@link #MODE_RINGTONE},
		* {@link #MODE_IN_CALL} or {@link #MODE_IN_COMMUNICATION}).
		* Informs the HAL about the current audio state so that
		* it can route the audio appropriately.
		*/
		@@ -1000,7 +1001,8 @@ public class AudioManager {
		/**
		* Returns the current audio mode.
		*
		* @return the current audio mode (NORMAL, RINGTONE, IN_CALL or IN_COMMUNICATION).
		* @return the current audio mode ({@link #MODE_NORMAL}, {@link #MODE_RINGTONE},
		* {@link #MODE_IN_CALL} or {@link #MODE_IN_COMMUNICATION}).
		* Returns the current current audio state from the HAL.
		*/
		public int getMode() {
		@@ -1038,7 +1040,6 @@ public class AudioManager {
		*/
		public static final int MODE_IN_CALL = AudioSystem.MODE_IN_CALL;
		/**
		* @hide
		* In communication audio mode. An audio/video chat or VoIP call is established.
		*/
		public static final int MODE_IN_COMMUNICATION = AudioSystem.MODE_IN_COMMUNICATION;