commit ca239d77d67597019c0c14d0591e454753367ae5
author Tyler Gunn <tgunn@google.com> Thu Oct 04 08:39:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 04 08:39:53 2018 -0700
tree 309a6aa10cacb9fb263fc9312a8a94fb2a5e1653
parent 65fef348ded531f1a10b41a30454cb48b4029a4c
parent 440158df4fe1dfaf63fec33c3488431bdb8ddab9

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

Change-Id: I73172c9f46aefe6382806ce30552a9498ebb7868

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index fd5aa7b..89ac721 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5660,7 +5660,7 @@
     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";

telephony/java/android/telephony/ims/ImsCallProfile.java

diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java
index 5d6a8c1..89ef339 100644
--- a/telephony/java/android/telephony/ims/ImsCallProfile.java
+++ b/telephony/java/android/telephony/ims/ImsCallProfile.java
@@ -117,12 +117,14 @@
      * @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
      */