summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-08-13 19:04:33 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-08-13 19:04:33 -0700
commit86816ceb724c69349cde7cacc743936cb12f0b2c (patch)
tree84ad12228b1c4aa07577e03407208b2484f9da17
parent415bd6751cf3ae342f9e39002e1266b75dd219df (diff)
parentc3da4cec90fbf6b0dbe0225930c81335519e503c (diff)
Merge "Overlay changes for STA+SAP support"
-rw-r--r--[-rwxr-xr-x]overlay/frameworks/base/core/res/res/values/config.xml8
-rw-r--r--sdm660_64.mk4
2 files changed, 9 insertions, 3 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index fea8214..ae64c3e 100755..100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -34,4 +34,12 @@
<integer name="config_sms_authorization_timeout_ms">15000</integer>
<!-- Enable SMS authorization support -->
<bool name="config_sms_authorization_enabled">true</bool>
+
+ <!-- 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>"wigig0"</item>
+ <item>"softap0"</item>
+ </string-array>
</resources>
diff --git a/sdm660_64.mk b/sdm660_64.mk
index 178975a..14d12e4 100644
--- a/sdm660_64.mk
+++ b/sdm660_64.mk
@@ -1,8 +1,6 @@
TARGET_USES_AOSP := true
-ifneq ($(TARGET_USES_AOSP),true)
- DEVICE_PACKAGE_OVERLAYS := device/qcom/sdm660_64/overlay
-endif
+DEVICE_PACKAGE_OVERLAYS := device/qcom/sdm660_64/overlay
# Default vendor configuration.
ifeq ($(ENABLE_VENDOR_IMAGE),)