diff options
| author | Xin Li <delphij@google.com> | 2020-08-27 10:16:06 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:06 -0700 |
| commit | 0b69784061364fd84fc569bfe1c792bff2399500 (patch) | |
| tree | 80112088e775b4bb7583e46c5bf274accbca5c68 | |
| parent | 70e3af02348df3f9fe5d7cb3ebb3519e4108df8e (diff) | |
| parent | 095a1d11a83a7ff4ab92dc7fd776be6ab74a9f14 (diff) | |
| download | beagle-x15-temp_sam_168057903.tar.gz | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507
Merged-In: I65974f17ab007170f37ddb5aa81a2f2c05bc2254
Change-Id: I2cdcc262de85c00bf4c8f014dfde4c73e3e8d72a
| -rw-r--r-- | BoardConfig.mk | 2 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 529a74e..368a411 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -73,8 +73,6 @@ BOARD_SEPOLICY_DIRS += \ ifeq ($(TARGET_PRODUCT),beagle_x15_auto) BOARD_SEPOLICY_DIRS += \ packages/services/Car/car_product/sepolicy - -DEVICE_MANIFEST_FILE += device/ti/beagle_x15/auto/manifest.xml endif BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 572fd75..c2c3095 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -66,8 +66,8 @@ <item>"9,1"</item> </string-array> - <!-- Boolean indicating whether the wifi chipset has dual frequency band support --> - <bool translatable="false" name="config_wifi_dual_band_support">true</bool> + <!-- Boolean indicating whether the wifi chipset has 5GHz frequency band support --> + <bool translatable="false" name="config_wifi5ghzSupport">true</bool> <!-- 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 |