zenfone6: Add Tethering Config
Tethering package is APEX and we need to create a RRO to overwrite
the values for config_tether_wifi_regexs and config_tether_wifi_p2p_regexs.
BUG: 163800715
Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: Ia0834f5215ff8c3b13effa591bd2f84d93419a06
diff --git a/device.mk b/device.mk
index e753c3f..b747c4d 100755
--- a/device.mk
+++ b/device.mk
@@ -195,6 +195,7 @@
# WiFi
PRODUCT_PACKAGES += \
libnl \
+ TetheringOverlay \
WifiOverlay
include vendor/qcom/opensource/display-commonsys-intf/config/display-product-system.mk
\ No newline at end of file
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 6d516a3..0a85d6f 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -186,15 +186,6 @@
Must be in the range specified by minimum and maximum. -->
<integer name="config_screenBrightnessSettingDefault">46</integer>
- <!-- 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>7</item>
- <item>0</item>
- </integer-array>
-
<!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
<bool name="config_unplugTurnsOnScreen">true</bool>
diff --git a/rro_overlays/TetheringOverlay/Android.bp b/rro_overlays/TetheringOverlay/Android.bp
new file mode 100644
index 0000000..d6ea4da
--- /dev/null
+++ b/rro_overlays/TetheringOverlay/Android.bp
@@ -0,0 +1,23 @@
+//
+// Copyright (C) 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.
+//
+
+runtime_resource_overlay {
+ name: "TetheringConfigOverlay",
+ theme: "TetheringConfigOverlay",
+ certificate: "platform",
+ sdk_version: "current",
+ product_specific: true
+}
diff --git a/rro_overlays/TetheringOverlay/AndroidManifest.xml b/rro_overlays/TetheringOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..046fca9
--- /dev/null
+++ b/rro_overlays/TetheringOverlay/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.networkstack.tethering.asus_msmnile"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <application android:hasCode="false" />
+ <overlay
+ android:targetPackage="com.android.networkstack.tethering"
+ android:targetName="TetheringConfig"
+ android:isStatic="true"
+ android:priority="0"/>
+</manifest>
diff --git a/rro_overlays/TetheringOverlay/res/values/config.xml b/rro_overlays/TetheringOverlay/res/values/config.xml
new file mode 100644
index 0000000..a46632a
--- /dev/null
+++ b/rro_overlays/TetheringOverlay/res/values/config.xml
@@ -0,0 +1,84 @@
+<?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">
+ <!-- List of regexpressions describing the interface (if any) that represent tetherable
+ USB interfaces. If the device doesn't want to support tething over USB this should
+ be empty. An example would be "usb.*" -->
+ <string-array translatable="false" name="config_tether_usb_regexs">
+ <item>"usb\\d"</item>
+ <item>"rndis\\d"</item>
+ </string-array>
+
+ <!-- List of regexpressions describing the interface (if any) that represent tetherable
+ Wifi interfaces. If the device doesn't want to support tethering over Wifi this
+ should be empty. An example would be "softap.*" -->
+ <string-array translatable="false" name="config_tether_wifi_regexs">
+ <item>softap0</item>
+ <item>wlan0</item>
+ <item>wigig0</item>
+ </string-array>
+
+ <!-- List of regexpressions describing the interface (if any) that represent tetherable
+ bluetooth interfaces. If the device doesn't want to support tethering over bluetooth this
+ should be empty. -->
+ <string-array translatable="false" name="config_tether_bluetooth_regexs">
+ <item>"bnep\\d"</item>
+ <item>"bt-pan"</item>
+ </string-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>
+
+ <!-- Dhcp range (min, max) to use for tethering purposes -->
+ <!-- USB is 192.168.42.1 and 255.255.255.0
+ Wifi is 192.168.43.1 and 255.255.255.0
+ BT is limited to max default of 5 connections. 192.168.44.1 to 192.168.48.1
+ with 255.255.255.0
+ P2P is 192.168.49.1 and 255.255.255.0
+ Wigig is 192.168.50.1 and 255.255.255.0
+ Wigig P2P is 192.168.51.1 and 255.255.255.0
+ -->
+ <string-array name="config_tether_dhcp_range">
+ <item>192.168.42.2</item>
+ <item>192.168.42.254</item>
+ <item>192.168.43.2</item>
+ <item>192.168.43.254</item>
+ <item>192.168.44.2</item>
+ <item>192.168.44.254</item>
+ <item>192.168.45.2</item>
+ <item>192.168.45.254</item>
+ <item>192.168.46.2</item>
+ <item>192.168.46.254</item>
+ <item>192.168.47.2</item>
+ <item>192.168.47.254</item>
+ <item>192.168.48.2</item>
+ <item>192.168.48.254</item>
+ <item>192.168.49.2</item>
+ <item>192.168.49.254</item>
+ <item>192.168.50.2</item>
+ <item>192.168.50.254</item>
+ <item>192.168.51.2</item>
+ <item>192.168.51.254</item>
+ <item>192.168.52.2</item>
+ <item>192.168.52.254</item>
+ </string-array>
+</resources>