diff options
| author | 2018-10-04 08:56:55 -0700 | |
|---|---|---|
| committer | 2018-10-04 08:56:55 -0700 | |
| commit | b2af2d531a77dda1ddbdcb6feb1be6a80c751afb (patch) | |
| tree | c25a5683f9aa907db743ab5eb17a411da9ec80e0 | |
| parent | 20af5eefa4808c5dc2c712b7bfbd0455ebc983a3 (diff) | |
| parent | ca239d77d67597019c0c14d0591e454753367ae5 (diff) | |
Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." am: 440158df4f
am: ca239d77d6
Change-Id: I6edd5403d90b0a3f7779026480835175693a2228
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/ImsCallProfile.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index e7c220bcdf05..e3cd561ae1cb 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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"; diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java index 5d6a8c158eed..89ef33914c12 100644 --- a/telephony/java/android/telephony/ims/ImsCallProfile.java +++ b/telephony/java/android/telephony/ims/ImsCallProfile.java @@ -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 */ |