Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add PROPERTY_VOIP_AUDIO_MODE to android.telecom.Call." am: cc690e9a48

Browse Source 
am: f2dc5a204a

Change-Id: I39dd19c1c09b15136460854fd0e5a2b8161766c3
This commit is contained in:
Tyler Gunn
2018-11-01 16:15:49 -07:00
committed by android-build-merger
parent 35d377e27d f2dc5a204a
commit 3584c0a088
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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
}

28
telecomm/java/android/telecom/Call.java
View File

@@ -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;
@@ -628,15 +644,21 @@ public final class Call {
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();
}