Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 208570a1 authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Add support for pdp reject retry feature" into rvc-dev am: e8be4f8c am: 3086ff3a 

Change-Id: Ib4d37a87d34337ed21b44425fb4c659a9a659464
parents c0c76b33 3086ff3a

core/res/res/values-mcc334-mnc020/config.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -18,4 +18,7 @@ 
-->

-->

<resources>

<resources>

    <bool name="config_use_sim_language_file">false</bool>

    <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>
 
</resources>
 
 No newline at end of file

core/res/res/values-mcc334-mnc020/strings.xml

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
<?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

core/res/res/values/config.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -4421,4 +4421,8 @@ 
    <!-- Set to true to make assistant show in front of the dream/screensaver. -->

    <!-- Set to true to make assistant show in front of the dream/screensaver. -->

    <bool name="config_assistantOnTopOfDream">false</bool>

    <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>
 
</resources>

core/res/res/values/strings.xml

+9 −0
Original line number Original line Diff line number Diff line
@@ -5747,4 +5747,13 @@ ul.</string> 
    <string name="PERSOSUBSTATE_SIM_IMPI_SUCCESS">IMPI unlock successful.</string>

    <string name="PERSOSUBSTATE_SIM_IMPI_SUCCESS">IMPI unlock successful.</string>

    <!-- Success message displayed on SIM NS_SP Depersonalization panel [CHAR LIMIT=none] -->

    <!-- 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>

    <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>
 
</resources>

core/res/res/values/symbols.xml

+7 −0
Original line number Original line Diff line number Diff line
@@ -4001,4 +4001,11 @@ 
  <java-symbol type="string" name="notification_channel_network_alerts" />

  <java-symbol type="string" name="notification_channel_network_alerts" />

  <java-symbol type="string" name="notification_channel_network_available" />

  <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>
 
</resources>