Merge "Add PROPERTY_VOIP_AUDIO_MODE to android.telecom.Call." am: cc690e9a48 am: f2dc5a204a
am: 3584c0a088
Change-Id: Ie20ead7404d1f200785104d896129212d126d9e7
diff --git a/api/current.txt b/api/current.txt
index b98ef68..ead6157 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -41668,6 +41668,7 @@
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
}
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index daa09f5..b6ac91d 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -467,8 +467,24 @@
*/
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;
@@ -628,15 +644,21 @@
if (hasProperty(properties, PROPERTY_IS_EXTERNAL_CALL)) {
builder.append(" PROPERTY_IS_EXTERNAL_CALL");
}
- if(hasProperty(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {
+ if (hasProperty(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {
builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY");
}
- if(hasProperty(properties, PROPERTY_ASSISTED_DIALING_USED)) {
+ if (hasProperty(properties, PROPERTY_ASSISTED_DIALING_USED)) {
builder.append(" PROPERTY_ASSISTED_DIALING_USED");
}
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();
}