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

Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." am: 440158df4f

Browse Source 
am: ca239d77d6

Change-Id: I6edd5403d90b0a3f7779026480835175693a2228
This commit is contained in:
Tyler Gunn
2018-10-04 08:56:55 -07:00
committed by android-build-merger
parent 20af5eefa4 ca239d77d6
commit b2af2d531a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -5636,7 +5636,7 @@ package android.telephony.ims {
field public static final java.lang.String EXTRA_CODEC = "Codec";
field public static final java.lang.String EXTRA_DIALSTRING = "dialstring";
field public static final java.lang.String EXTRA_DISPLAY_TEXT = "DisplayText";
field public static final java.lang.String EXTRA_E_CALL = "e_call";
field public static final java.lang.String EXTRA_EMERGENCY_CALL = "e_call";
field public static final java.lang.String EXTRA_IS_CALL_PULL = "CallPull";
field public static final java.lang.String EXTRA_OI = "oi";
field public static final java.lang.String EXTRA_OIR = "oir";

4
telephony/java/android/telephony/ims/ImsCallProfile.java
View File

@@ -117,12 +117,14 @@ public final class ImsCallProfile implements Parcelable {
* @hide
*/
public static final String EXTRA_CONFERENCE = "conference";
/**
* Boolean extra property set on an {@link ImsCallProfile} to indicate that this call is an
* emergency call. The {@link ImsService} sets this on a call to indicate that the network has
* identified the call as an emergency call.
*/
public static final String EXTRA_E_CALL = "e_call";
public static final String EXTRA_EMERGENCY_CALL = "e_call";
/**
* @hide
*/