sm6250-common: 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
This commit is contained in:
Weilun Du
Demon000
parent
66f8d29ca8
commit
8ef6293311
@ -339,6 +339,10 @@ PRODUCT_COPY_FILES += \
|
|||||||
frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml \
|
frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml \
|
||||||
frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml
|
frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml
|
||||||
|
|
||||||
|
# Tethering
|
||||||
|
PRODUCT_PACKAGES += \
|
||||||
|
TetheringConfigOverlay
|
||||||
|
|
||||||
# TextClassifier
|
# TextClassifier
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
textclassifier.bundle1
|
textclassifier.bundle1
|
||||||
|
|||||||
@ -30,62 +30,6 @@
|
|||||||
<!-- MMS user agent prolfile url -->
|
<!-- MMS user agent prolfile url -->
|
||||||
<string name="config_mms_user_agent_profile_url">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
|
<string name="config_mms_user_agent_profile_url">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
|
||||||
|
|
||||||
<!-- 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 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 name="config_tether_wifi_regexs">
|
|
||||||
<item>"softap0"</item>
|
|
||||||
<item>"wlan0"</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 name="config_tether_bluetooth_regexs">
|
|
||||||
<item>"bnep\\d"</item>
|
|
||||||
<item>"bt-pan"</item>
|
|
||||||
</string-array>
|
|
||||||
|
|
||||||
<!-- 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>
|
|
||||||
</string-array>
|
|
||||||
|
|
||||||
<!-- This string array should be overridden by the device to present a list of network
|
<!-- 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
|
attributes. This is used by the connectivity manager to decide which networks can coexist
|
||||||
based on the hardware -->
|
based on the hardware -->
|
||||||
|
|||||||
22
rro_overlays/TetheringOverlay/Android.bp
Normal file
22
rro_overlays/TetheringOverlay/Android.bp
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
//
|
||||||
|
// 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",
|
||||||
|
resource_dirs: ["res"],
|
||||||
|
product_specific: true,
|
||||||
|
sdk_version: "current",
|
||||||
|
}
|
||||||
11
rro_overlays/TetheringOverlay/AndroidManifest.xml
Normal file
11
rro_overlays/TetheringOverlay/AndroidManifest.xml
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.android.networkstack.tethering.xiaomi_sm6250"
|
||||||
|
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>
|
||||||
76
rro_overlays/TetheringOverlay/res/values/config.xml
Normal file
76
rro_overlays/TetheringOverlay/res/values/config.xml
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
<?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 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 name="config_tether_wifi_regexs">
|
||||||
|
<item>"softap0"</item>
|
||||||
|
<item>"wlan0"</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 name="config_tether_bluetooth_regexs">
|
||||||
|
<item>"bnep\\d"</item>
|
||||||
|
<item>"bt-pan"</item>
|
||||||
|
</string-array>
|
||||||
|
|
||||||
|
<!-- 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>
|
||||||
|
</string-array>
|
||||||
|
</resources>
|
||||||
Loading…
Reference in New Issue
Block a user