From 63d9e496f3b9bc140a8b2843f3db18daec0c4ae6 Mon Sep 17 00:00:00 2001
From: Susheel Nyamala <quic_snyamala@quicinc.com>
Date: Tue, 14 May 2019 16:46:09 +0530
Subject: [PATCH] Add support for pdp reject retry feature

1. Define config values for retry interval
2. Define config values to operator mcc-mnc config file

Bug: 152277258
Test: Compile build for pixel variant
      Device bootup and camps

Change-Id: I0c897589852acecab41bdbf20c8abda7f53c20ab
Merged-in: I0c897589852acecab41bdbf20c8abda7f53c20ab
(cherry picked from commit b5005dbca893aff869c491033b96287a6ca5ba07)
---
 core/res/res/values-mcc334-mnc020/config.xml  |  5 +++-
 core/res/res/values-mcc334-mnc020/strings.xml | 25 +++++++++++++++++++
 core/res/res/values/config.xml                |  5 ++++
 core/res/res/values/strings.xml               |  6 +++++
 core/res/res/values/symbols.xml               |  8 ++++++
 5 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 core/res/res/values-mcc334-mnc020/strings.xml

diff --git a/core/res/res/values-mcc334-mnc020/config.xml b/core/res/res/values-mcc334-mnc020/config.xml
index 0970517835b6f..4aad53460038a 100644
--- a/core/res/res/values-mcc334-mnc020/config.xml
+++ b/core/res/res/values-mcc334-mnc020/config.xml
@@ -18,4 +18,7 @@
 -->
 <resources>
     <bool name="config_use_sim_language_file">false</bool>
-</resources>
\ No newline at end of file
+
+    <bool name="config_pdp_rejeect_enable_retry">true</bool>
+    <integer name="config_pdp_reject_retry_delay_ms">45000</integer>
+</resources>
diff --git a/core/res/res/values-mcc334-mnc020/strings.xml b/core/res/res/values-mcc334-mnc020/strings.xml
new file mode 100644
index 0000000000000..91b560aeef7ec
--- /dev/null
+++ b/core/res/res/values-mcc334-mnc020/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2020, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="config_pdp_reject_dialog_title"></string>
+    <string name="config_pdp_reject_user_authentication_failed">AUTHENTICATION FAILURE -29-.</string>
+    <string name="config_pdp_reject_service_not_subscribed">NOT SUBSCRIBED TO SERVICE -33-.</string>
+    <string name="config_pdp_reject_multi_conn_to_same_pdn_not_allowed">Multiple PDN connections for a given APN not allowed -55-.</string>
+</resources>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index b945cef175439..7bd34728e28fa 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4377,4 +4377,9 @@
 
     <!-- Class name of the custom country detector to be used. -->
     <string name="config_customCountryDetector" translatable="false">com.android.server.location.ComprehensiveCountryDetector</string>
+
+    <!-- pdp data retry for cause 29, 33 and 55-->
+    <bool name="config_pdp_reject_enable_retry">false</bool>
+    <!--pdp data reject retry delay in ms-->
+    <integer name="config_pdp_reject_retry_delay_ms">-1</integer>
 </resources>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 738d16ba991c6..753ebeae99fe9 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -5662,4 +5662,10 @@ ul.</string>
     <string name="PERSOSUBSTATE_SIM_IMPI_SUCCESS">IMPI unlock successful.</string>
     <!-- Success message displayed on SIM NS_SP Depersonalization panel [CHAR LIMIT=none] -->
     <string name="PERSOSUBSTATE_SIM_NS_SP_SUCCESS">Network subset service provider unlock successful.</string>
+
+     <!-- pdp data reject dialog string for cause 29, 33 and 55-->
+    <string name="config_pdp_reject_dialog_title"></string>
+    <string name="config_pdp_reject_user_authentication_failed"></string>
+    <string name="config_pdp_reject_service_not_subscribed"></string>
+    <string name="config_pdp_reject_multi_conn_to_same_pdn_not_allowed"></string>
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 9ebe9aaf4f39a..fc091635ed927 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3877,4 +3877,12 @@
   <java-symbol type="bool" name="config_automotiveHideNavBarForKeyboard" />
   <java-symbol type="bool" name="reset_geo_fencing_check_after_boot_or_apm" />
   <java-symbol type="bool" name="config_enableAutoSuspend" />
+
+  <!-- For Pdn throttle feature -->
+  <java-symbol type="bool" name="config_pdp_reject_enable_retry" />
+  <java-symbol type="integer" name="config_pdp_reject_retry_delay_ms" />
+  <java-symbol type="string" name="config_pdp_reject_dialog_title" />
+  <java-symbol type="string" name="config_pdp_reject_user_authentication_failed" />
+  <java-symbol type="string" name="config_pdp_reject_service_not_subscribed" />
+  <java-symbol type="string" name="config_pdp_reject_multi_conn_to_same_pdn_not_allowed" />
 </resources>