diff options
| author | Eric Jeong <ericjeong@google.com> | 2020-07-27 15:31:54 -0700 |
|---|---|---|
| committer | Eric Jeong <ericjeong@google.com> | 2020-07-27 15:31:54 -0700 |
| commit | 4394e77c8c593d6fd6f29be69c6cc85daffa438e (patch) | |
| tree | 309fbf6a69e5d3a509b00122b879d4f4a4cc4061 | |
| parent | 3ad51234105b2f8ce5950fb8ef18ab6ceddce2f1 (diff) | |
| download | device_generic_goldfish-4394e77c8c593d6fd6f29be69c6cc85daffa438e.tar.gz device_generic_goldfish-4394e77c8c593d6fd6f29be69c6cc85daffa438e.tar.bz2 device_generic_goldfish-4394e77c8c593d6fd6f29be69c6cc85daffa438e.zip | |
Define config_tether_wifi_regexs at the right place
- It should be defined under com.android.networkstack.tethering
- config_tether_wifi_regexs under frameworks/base/core was deprecated
Bug: 161489057
Test: dumpsys tethering and make sure that tetherableWifiRegexs shows
wlan\d.
Change-Id: If677ba154119f103c92e611ad81ccf98dbc01a1f
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 5 | ||||
| -rw-r--r-- | overlay/frameworks/base/packages/Tethering/res/values/config.xml | 25 |
2 files changed, 25 insertions, 5 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index b9f0babf..a63f25a4 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -41,11 +41,6 @@ which means to get a larger screen. --> <bool name="config_lidControlsDisplayFold">true</bool> - <!-- Allow testing SoftAP using the simulated interfaces on the emulator. --> - <string-array name="config_tether_wifi_regexs"> - <item>"wlan\\d"</item> - </string-array> - <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService when registering authenticators with BiometricService. Format must be ID:Modality:Strength, where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java, diff --git a/overlay/frameworks/base/packages/Tethering/res/values/config.xml b/overlay/frameworks/base/packages/Tethering/res/values/config.xml new file mode 100644 index 00000000..df8c1838 --- /dev/null +++ b/overlay/frameworks/base/packages/Tethering/res/values/config.xml @@ -0,0 +1,25 @@ +<?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"> + <!-- Allow testing SoftAP using the simulated interfaces on the emulator. --> + <string-array name="config_tether_wifi_regexs"> + <item>"wlan\\d"</item> + </string-array> +</resources> |