diff options
| author | 2018-10-04 15:21:51 +0000 | |
|---|---|---|
| committer | 2018-10-04 15:21:51 +0000 | |
| commit | 440158df4fe1dfaf63fec33c3488431bdb8ddab9 (patch) | |
| tree | eb7b22e4b70e1f5ab55606a45df9aec6f7b384d4 | |
| parent | afffa372486153292c67d20c48d5756db15fee74 (diff) | |
| parent | 70f9063dde66040118ee1bf4621bfb5b23177f17 (diff) | |
Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL."
| -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 fd5aa7b59741..89ac7210de46 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5660,7 +5660,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 */ |