summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brad Ebinger <breadley@google.com> 2020-12-07 21:31:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-07 21:31:58 +0000
commit56732860a8d1f348eba86d60bf6681514820bc01 (patch)
treee9fe54212dcfbc88c09c448d883e6c1824b80b36
parent057a181dfca31ee2aae7479b923bd025b2f7dfce (diff)
parenta5d6ec9b481e616b87500118fb340b3efc75d8d6 (diff)
Merge "Define EXTRA_CODE_CALL_RETRY_EMERGENCY for emergency CS retry" am: cf38228e0d am: 414d2a5175 am: a5d6ec9b48
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1264905 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I398e08a596935f5430251ee72038951810c294f9
-rw-r--r--core/api/current.txt1
-rw-r--r--telephony/java/android/telephony/ims/ImsReasonInfo.java7
2 files changed, 8 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 8b350f5b7c06..14c1dc873650 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -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
}
diff --git a/telephony/java/android/telephony/ims/ImsReasonInfo.java b/telephony/java/android/telephony/ims/ImsReasonInfo.java
index 184477af0b46..c14024975cf5 100644
--- a/telephony/java/android/telephony/ims/ImsReasonInfo.java
+++ b/telephony/java/android/telephony/ims/ImsReasonInfo.java
@@ -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 */