commit f3e5403f7174ff36e3b75bb1a8307b573ad4dd54
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 07 21:14:38 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 07 21:14:38 2020 +0000
tree 6980a24636757497ebbbbef6719b6ec42865cdb0
parent cf38228e0dfd3e275db08e4d065f9cacda071d99
parent 17dd74a128f5a5c03ed7026235aab8433c49c199

Merge "Update BackgroundDexOptServiceIntegrationTests"

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 3ac8c9a..77f0ca6 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -47311,6 +47311,7 @@
     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

diff --git a/telephony/java/android/telephony/ims/ImsReasonInfo.java b/telephony/java/android/telephony/ims/ImsReasonInfo.java
index 184477a..c140249 100644
--- a/telephony/java/android/telephony/ims/ImsReasonInfo.java
+++ b/telephony/java/android/telephony/ims/ImsReasonInfo.java
@@ -1322,6 +1322,13 @@
      */
     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 */