Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca239d77 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." 

am: 440158df

Change-Id: I73172c9f46aefe6382806ce30552a9498ebb7868
parents 65fef348 440158df

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

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

+3 −1
Original line number Diff line number Diff line
@@ -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

     */