diff options
| author | 2019-05-14 16:46:09 +0530 | |
|---|---|---|
| committer | 2020-05-06 13:20:47 -0700 | |
| commit | e37a5783ec4c44a70950c3c4b782b444954fceef (patch) | |
| tree | 36fd714b69f2f174e6117355e19b81a9e300a2d0 | |
| parent | a83fad74b45e702b5fcf8cbf1b0b0bf6786bd2df (diff) | |
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: basic sanity, TH
Change-Id: I0c897589852acecab41bdbf20c8abda7f53c20ab
(cherry picked from commit a9387ccc33acfb788cc7802cbfb2bb19edbde414)
| -rw-r--r-- | core/res/res/values-mcc334-mnc020/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values-mcc334-mnc020/strings.xml | 24 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 7 |
5 files changed, 47 insertions, 0 deletions
diff --git a/core/res/res/values-mcc334-mnc020/config.xml b/core/res/res/values-mcc334-mnc020/config.xml index 0970517835b6..c64acc7c29db 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> + + <bool name="config_pdp_rejeect_enable_retry">true</bool> + <integer name="config_pdp_reject_retry_delay_ms">45000</integer> </resources>
\ No newline at end of file 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 000000000000..a8a78d5ef3fc --- /dev/null +++ b/core/res/res/values-mcc334-mnc020/strings.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** 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>
\ No newline at end of file diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index fa4c25ad460a..65fa3fa1ee1d 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4421,4 +4421,8 @@ <!-- Set to true to make assistant show in front of the dream/screensaver. --> <bool name="config_assistantOnTopOfDream">false</bool> + <!-- 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 51b23dbfb59b..35a7857b839f 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5747,4 +5747,13 @@ 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 [CHAR LIMIT=100] --> + <string name="config_pdp_reject_dialog_title"></string> + <!-- pdp data reject dialog string for cause 29 (USER_AUTHENTICATION) [CHAR LIMIT=100] --> + <string name="config_pdp_reject_user_authentication_failed"></string> + <!-- pdp data reject dialog string for cause 33 (SERVICE_OPTION_NOT_SUBSCRIBED) [CHAR LIMIT=100] --> + <string name="config_pdp_reject_service_not_subscribed"></string> + <!-- pdp data reject dialog string for cause 55 (MULTI_CONN_TO_SAME_PDN_NOT_ALLOWED) [CHAR LIMIT=100] --> + <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 a82e7784b167..39c8609399ea 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3999,4 +3999,11 @@ <java-symbol type="string" name="notification_channel_network_alerts" /> <java-symbol type="string" name="notification_channel_network_available" /> + <!-- 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> |