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

Commit e376c807 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Place non-mobile tethering upstream types first"

parents 7d0a1d71 fa256da9
Loading
Loading
Loading
Loading
+30 −9
Original line number Diff line number Diff line
@@ -411,24 +411,45 @@
     -->
    <integer translatable="false" name="config_wifi_wakeup_available">0</integer>

    <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
    <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
    <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
    <!-- This list is also modified by code within the framework, including:
    <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering.

         Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
         [1,7,0] for TYPE_WIFI, TYPE_BLUETOOTH, and TYPE_MOBILE.

         This list is also modified by code within the framework, including:

             - TYPE_ETHERNET (9) is prepended to this list, and
             - the output of TelephonyManager.getTetherApnRequired()
               determines whether both TYPE_MOBILE (0) and TYPE_HIPRI (5)
               or TYPE_MOBILE_DUN (4) are appended (if not already present).

             - the return value of TelephonyManager.getTetherApnRequired()
               determines how the array is further modified:

                   * DUN_REQUIRED
                     TYPE_MOBILE is removed (if present)
                     TYPE_MOBILE_HIPRI is removed (if present)
                     TYPE_MOBILE_DUN is appended (if not already present)

                   * DUN_NOT_REQUIRED
                     TYPE_MOBILE_DUN is removed (if present)
                     TYPE_MOBILE is appended (if not already present)
                     TYPE_MOBILE_HIPRI is appended (if not already present)

                   * DUN_UNSPECIFIED
                     if any of TYPE_MOBILE{,_DUN,_HIPRI} are present:
                         change nothing
                     else:
                         TYPE_MOBILE is appended
                         TYPE_MOBILE_HIPRI is appended

         For other changes applied to this list, now and in the future, see
         com.android.server.connectivity.tethering.TetheringConfiguration.

         Note also: the order of this is important. The first upstream type
         for which a satisfying network exists is used.
      -->
    <integer-array translatable="false" name="config_tether_upstream_types">
        <item>0</item>
        <item>1</item>
        <item>5</item>
        <item>7</item>
        <item>0</item>
    </integer-array>

    <!-- If the DUN connection for this CDMA device supports more than just DUN -->