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

Commit 9a53c113 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "telephony: Change string to string-array config_tether_apndata to...

Merge "telephony: Change string to string-array config_tether_apndata to support mvno" into lmp-mr1-dev
parents 5aadd5b6 767461e5
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -33,8 +33,11 @@

    <!-- String containing the apn value for tethering.  May be overriden by secure settings
         TETHER_DUN_APN.  Value is a comma separated series of strings:
         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
         Or string format of ApnSettingV3.
         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
    <string translatable="false" name="config_tether_apndata">Vf Tethering,internet.vodafone.gr,,,,,,,,,202,05,,DUN</string>
    <string-array translatable="false" name="config_tether_apndata">
      <item>Vf Tethering,internet.vodafone.gr,,,,,,,,,202,05,,DUN</item>
    </string-array>

</resources>
+5 −2
Original line number Diff line number Diff line
@@ -31,9 +31,12 @@

    <!-- String containing the apn value for tethering.  May be overriden by secure settings
         TETHER_DUN_APN.  Value is a comma separated series of strings:
         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
         Or string format of ApnSettingV3.
         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
    <string translatable="false" name="config_tether_apndata">SFR option modem,websfr,,,,,,,,,208,10,,DUN</string>
    <string-array translatable="false" name="config_tether_apndata">
        <item>SFR option modem,websfr,,,,,,,,,208,10,,DUN</item>
    </string-array>

    <string-array translatable="false" name="config_operatorConsideredNonRoaming">
        <item>21401</item>
+5 −2
Original line number Diff line number Diff line
@@ -33,9 +33,12 @@

    <!-- String containing the apn value for tethering.  May be overriden by secure settings
         TETHER_DUN_APN.  Value is a comma separated series of strings:
         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
         Or string format of ApnSettingV3.
         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
    <string translatable="false" name="config_tether_apndata">INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,1,DUN</string>
    <string-array translatable="false" name="config_tether_apndata">
      <item>INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,1,DUN</item>
    </string-array>

    <string-array translatable="false" name="config_operatorConsideredNonRoaming">
        <item>21402</item>
+3 −1
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@
         TETHER_DUN_APN.  Value is a comma separated series of strings:
         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
    <string translatable="false" name="config_tether_apndata">Conexion Compartida,movistar.es,,,MOVISTAR,MOVISTAR,,,,,214,07,1,DUN</string>
    <string-array translatable="false" name="config_tether_apndata">
        <item>Conexion Compartida,movistar.es,,,MOVISTAR,MOVISTAR,,,,,214,07,1,DUN</item>
    </string-array>

</resources>
+5 −2
Original line number Diff line number Diff line
@@ -32,9 +32,12 @@

    <!-- String containing the apn value for tethering.  May be overriden by secure settings
         TETHER_DUN_APN.  Value is a comma separated series of strings:
         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
         Or string format of ApnSettingV3.
         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
    <string translatable="false" name="config_tether_apndata">Tethering Internet,web.omnitel.it,,,,,,,,,222,10,,DUN</string>
    <string-array translatable="false" name="config_tether_apndata">
      <item>Tethering Internet,web.omnitel.it,,,,,,,,,222,10,,DUN</item>
    </string-array>

    <string-array translatable="false" name="config_operatorConsideredNonRoaming">
        <item>21401</item>
Loading