summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jack Yu <jackyu@google.com> 2018-08-21 16:57:36 -0700
committer Jayachandran Chinnakkannu <jayachandranc@google.com> 2018-08-30 17:11:34 +0000
commita40ba289642b59744892371e75da9c2980a4fcbf (patch)
tree5ff0ae83ce0fd3fbdeeb85d3000fb3fe727a4ad0
parent7795e97f27d5fd6f33fafadcfdaa33d42ca40c29 (diff)
DO NOT MERGE: Added a new carrier config for data connection failed radio restart
Added a new carrier config that can trigger modem restart when receiving specific setup data fail cause code. Test: Telephony sanity tests Bug: 111774203 Change-Id: I39d648117f778a4548a3d50e624dbd841956c6cc
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index a8b39e3b06bd..742f059ab4e6 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -152,9 +152,17 @@ public class CarrierConfigManager {
* Flag indicating whether radio is to be restarted on error PDP_FAIL_REGULAR_DEACTIVATION
* This is false by default.
*/
- public static final String
- KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL =
- "restart_radio_on_pdp_fail_regular_deactivation_bool";
+ public static final String KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL =
+ "restart_radio_on_pdp_fail_regular_deactivation_bool";
+
+ /**
+ * A list of failure cause codes that will trigger a modem restart when telephony receiving
+ * one of those during data setup. The cause codes are defined in 3GPP TS 24.008 Annex I and
+ * TS 24.301 Annex B.
+ * @hide
+ */
+ public static final String KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY =
+ "radio_restart_failure_causes_int_array";
/**
* If true, enable vibration (haptic feedback) for key presses in the EmergencyDialer activity.
@@ -2100,6 +2108,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, false);
sDefaults.putBoolean(KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL, true);
sDefaults.putBoolean(KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL, false);
+ sDefaults.putIntArray(KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY, new int[]{});
sDefaults.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0);
sDefaults.putString(KEY_DEFAULT_SIM_CALL_MANAGER_STRING, "");
sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, "");