From 4d061aab6dfa3570301d8e1ee35105bf45cc748d Mon Sep 17 00:00:00 2001
From: Valera1978 <valera1978@tut.by>
Date: Fri, 6 Dec 2019 13:30:51 +0300
Subject: [PATCH] cleanup

---
 BoardConfig.mk                   | 13 ++++---------
 configs/compatibility_matrix.xml | 27 +++++++++++++++++++++++++++
 device.mk                        | 10 ++++++----
 3 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2918943..7620591 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -27,9 +27,6 @@ TARGET_SPECIFIC_HEADER_PATH := $(DEVICE_PATH)/include
 # Assert
 TARGET_OTA_ASSERT_DEVICE := gts3llte
 
-# ADB Legacy Interface
-TARGET_USES_LEGACY_ADB_INTERFACE := true
-
 # Architecture
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
@@ -98,12 +95,11 @@ AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true
 BOARD_USES_ALSA_AUDIO := true
 #USE_CUSTOM_AUDIO_POLICY := 1
 
+AUDIO_FEATURE_ENABLED_DEV_ARBI := true
+
 USE_XML_AUDIO_POLICY_CONF := 1
 TARGET_USES_AOSP_FOR_AUDIO := true
 
-# Bionic
-TARGET_NEEDS_LEGACY_MUTEX_HANDLE := true
-
 # Bluetooth
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
 BOARD_HAS_QCA_BT_ROME := true
@@ -132,7 +128,6 @@ TARGET_USES_OVERLAY := true
 
 MAX_EGL_CACHE_KEY_SIZE := 12*1024
 MAX_EGL_CACHE_SIZE := 2048*1024
-
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000
 VSYNC_EVENT_PHASE_OFFSET_NS := 2000000
@@ -180,7 +175,6 @@ TARGET_PLATFORM_DEVICE_BASE := /devices/soc/
 TARGET_PROVIDES_KEYMASTER := true
 
 # Power
-TARGET_HAS_NO_WLAN_STATS := true
 TARGET_USES_INTERACTION_BOOST := true
 
 # QCOM
@@ -193,6 +187,7 @@ BOARD_ROOT_EXTRA_SYMLINKS += /system/etc/firmware/btnv32.bin:/bt_firmware/image/
 
 # Recovery
 TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
+BOARD_HAS_LARGE_FILESYSTEM := true
 TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
 
@@ -205,7 +200,6 @@ TARGET_USERIMAGES_USE_F2FS := true
 
 # RIL
 PROTOBUF_SUPPORTED := true
-TARGET_RIL_VARIANT := caf
 
 # Security patch level - T825XXU3CSH7
 VENDOR_SECURITY_PATCH := 2019-08-01
@@ -228,6 +222,7 @@ HOSTAPD_VERSION := VER_0_8_X
 WIFI_DRIVER_FW_PATH_AP := "ap"
 WIFI_DRIVER_FW_PATH_STA := "sta"
 WIFI_DRIVER_FW_PATH_P2P := "p2p"
+WIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION := true
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 
 BOARD_HAVE_SAMSUNG_WIFI := true
diff --git a/configs/compatibility_matrix.xml b/configs/compatibility_matrix.xml
index 3082485..e549136 100644
--- a/configs/compatibility_matrix.xml
+++ b/configs/compatibility_matrix.xml
@@ -1,3 +1,30 @@
+<!-- Copyright (c) 2017, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
 <compatibility-matrix version="1.0" type="device">
     <hal format="hidl" optional="false">
         <name>android.frameworks.schedulerservice</name>
diff --git a/device.mk b/device.mk
index 57c51b9..8f9f6d2 100755
--- a/device.mk
+++ b/device.mk
@@ -215,7 +215,8 @@ PRODUCT_PACKAGES += \
     libcurl \
     libgnss \
     libgnsspps \
-    libsensorndkbridge
+    libsensorndkbridge \
+    libwifi-hal-ctrl
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/gps/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \
@@ -352,11 +353,12 @@ PRODUCT_PACKAGES += \
 
 # RIL
 PRODUCT_PACKAGES += \
-    android.hardware.radio@1.2 \
+    android.hardware.radio@1.4 \
     android.hardware.radio.config@1.0 \
-    libprotobuf-cpp-full \
+    android.hardware.secure_element@1.0 \
     librmnetctl \
-    libxml2
+    libxml2 \
+    libprotobuf-cpp-full
 
 # Seccomp policy
 PRODUCT_COPY_FILES += \