Merge "Add PROPERTY_VOIP_AUDIO_MODE to android.telecom.Call." (f2dc5a20) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -41123,6 +41123,7 @@ package android.telecom {
		field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800
		field public static final int PROPERTY_RTT = 1024; // 0x400
		field public static final int PROPERTY_SELF_MANAGED = 256; // 0x100
		field public static final int PROPERTY_VOIP_AUDIO_MODE = 4096; // 0x1000
		field public static final int PROPERTY_WIFI = 8; // 0x8
		}

telecomm/java/android/telecom/Call.java

+25 −3

Original line number	Diff line number	Diff line
		@@ -467,8 +467,24 @@ public final class Call {
		*/
		public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 0x00000800;

		/**
		* Indicates that the call is using VoIP audio mode.
		* <p>
		* When this property is set, the {@link android.media.AudioManager} audio mode for this
		* call will be {@link android.media.AudioManager#MODE_IN_COMMUNICATION}. When this
		* property is not set, the audio mode for this call will be
		* {@link android.media.AudioManager#MODE_IN_CALL}.
		* <p>
		* This property reflects changes made using {@link Connection#setAudioModeIsVoip(boolean)}.
		* <p>
		* You can use this property to determine whether an un-answered incoming call or a held
		* call will use VoIP audio mode (if the call does not currently have focus, the system
		* audio mode may not reflect the mode the call will use).
		*/
		public static final int PROPERTY_VOIP_AUDIO_MODE = 0x00001000;

		//******************************************************************************************
		// Next PROPERTY value: 0x00001000
		// Next PROPERTY value: 0x00002000
		//******************************************************************************************

		private final String mTelecomCallId;
		@@ -637,6 +653,12 @@ public final class Call {
		if (hasProperty(properties, PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL)) {
		builder.append(" PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL");
		}
		if (hasProperty(properties, PROPERTY_RTT)) {
		builder.append(" PROPERTY_RTT");
		}
		if (hasProperty(properties, PROPERTY_VOIP_AUDIO_MODE)) {
		builder.append(" PROPERTY_VOIP_AUDIO_MODE");
		}
		builder.append("]");
		return builder.toString();
		}