From 8973f6f99585d71edc67cddd35274a0bfeefdb42 Mon Sep 17 00:00:00 2001
From: Erik Kline <ek@google.com>
Date: Sat, 16 Jun 2018 21:10:19 +0900
Subject: [PATCH] sdm660-common: Use tether automatic upstream selection

(config_tether_upstream_automatic=true)

Test: as follows
    - built, flashed, booted
Bug: 32163131
Bug: 62648872
Bug: 63282480
Bug: 110118584
Bug: 110260419

Change-Id: I604cda53d6d37a33de3e3ccc65c0da781d21278b
---
 .../frameworks/base/core/res/res/values/config.xml  | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index e20c2900..b73f0e22 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -155,15 +155,10 @@
         <item>"bt-pan"</item>
     </string-array>
 
-    <!-- Array of allowable ConnectivityManager network types 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 -->
-    <integer-array translatable="false" name="config_tether_upstream_types">
-        <item>1</item>
-        <item>0</item>
-        <item>5</item>
-        <item>7</item>
-    </integer-array>
+    <!-- When true, the tethering upstream network follows the current default
+         Internet network (except when the current default network is mobile,
+         in which case a DUN network will be used if required). -->
+    <bool translatable="false" name="config_tether_upstream_automatic">true</bool>
 
     <!-- This string array should be overridden by the device to present a list of network
          attributes.  This is used by the connectivity manager to decide which networks can coexist