6896f6193f
This change is a combination of following changes: 1) Tethering: add TETHERING_WIGIG type Currently both WIFI and WIGIG use the same tethering type, TETHERING_WIFI. This causes conflicts between the frameworks, when both WIFI and WIGIG SoftAPs are started, one or both will not work. Fix this by using a seperate tethering type for WIGIG. 2) Tethering: remove TETHERING_WIGIG state machine on interface down The wigig state machine relies on a TETHERING_STATE_CHANGED broadcast that is sent when the tethering state machine is first created, during interface up. Currently the tethering state machine is not removed on interface down except for TETHERING_BLUETOOTH, and as a result wigig tethering only works the first time SoftAP is started. In order to fix this, remove the tethering state machine on interface down for TETHERING_WIGIG as well. Bug: 143356416 Test: TetheringCoverageTests Change-Id: Ic4d3aca0ed69234093af7f0206dab3335938c52a
46 lines
2.5 KiB
XML
46 lines
2.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- 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.
|
|
-->
|
|
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
|
<overlayable name="TetheringConfig">
|
|
<policy type="product|system|vendor">
|
|
<!-- Params from config.xml that can be overlaid -->
|
|
<item type="array" name="config_tether_usb_regexs"/>
|
|
<item type="array" name="config_tether_ncm_regexs" />
|
|
<item type="array" name="config_tether_wifi_regexs"/>
|
|
<item type="array" name="config_tether_wigig_regexs"/>
|
|
<item type="array" name="config_tether_wifi_p2p_regexs"/>
|
|
<item type="array" name="config_tether_bluetooth_regexs"/>
|
|
<item type="array" name="config_tether_dhcp_range"/>
|
|
<!-- Use the BPF offload for tethering when the kernel has support. True by default.
|
|
If the device doesn't want to support tether BPF offload, this should be false.
|
|
Note that this setting could be overridden by device config.
|
|
-->
|
|
<item type="bool" name="config_tether_enable_bpf_offload"/>
|
|
<item type="bool" name="config_tether_enable_legacy_dhcp_server"/>
|
|
<item type="integer" name="config_tether_offload_poll_interval"/>
|
|
<item type="array" name="config_tether_upstream_types"/>
|
|
<item type="bool" name="config_tether_upstream_automatic"/>
|
|
<!-- Configuration values for tethering entitlement check -->
|
|
<item type="array" name="config_mobile_hotspot_provision_app"/>
|
|
<item type="string" name="config_mobile_hotspot_provision_app_no_ui"/>
|
|
<item type="string" name="config_mobile_hotspot_provision_response"/>
|
|
<item type="integer" name="config_mobile_hotspot_provision_check_period"/>
|
|
<item type="string" name="config_wifi_tether_enable"/>
|
|
<!-- Params from config.xml that can be overlaid -->
|
|
</policy>
|
|
</overlayable>
|
|
</resources>
|