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

Commit 56732860 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Define EXTRA_CODE_CALL_RETRY_EMERGENCY for emergency CS retry" am:... 

Merge "Define EXTRA_CODE_CALL_RETRY_EMERGENCY for emergency CS retry" am: cf38228e am: 414d2a51 am: a5d6ec9b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1264905

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I398e08a596935f5430251ee72038951810c294f9
parents 057a181d a5d6ec9b

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -47784,6 +47784,7 @@ package android.telephony.ims { 
    field public static final int CODE_WIFI_LOST = 1407; // 0x57f

    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.ImsReasonInfo> CREATOR;

    field public static final int EXTRA_CODE_CALL_RETRY_BY_SETTINGS = 3; // 0x3

    field public static final int EXTRA_CODE_CALL_RETRY_EMERGENCY = 4; // 0x4

    field public static final int EXTRA_CODE_CALL_RETRY_NORMAL = 1; // 0x1

    field public static final int EXTRA_CODE_CALL_RETRY_SILENT_REDIAL = 2; // 0x2

  }

telephony/java/android/telephony/ims/ImsReasonInfo.java

+7 −0
Original line number Diff line number Diff line
@@ -1322,6 +1322,13 @@ public final class ImsReasonInfo implements Parcelable { 
     */

    public static final int EXTRA_CODE_CALL_RETRY_BY_SETTINGS = 3;



    /**

     * An extra that may be populated when the {@link #CODE_LOCAL_CALL_CS_RETRY_REQUIRED} result has

     * been returned.

     * <p>

     * Try to connect the call using CS as emergency

     */

    public static final int EXTRA_CODE_CALL_RETRY_EMERGENCY = 4;



    // For main reason code

    /** @hide */