libra: device tree cleanup

Change-Id: I08c87f3e2f5d16ed98c7acaaf700f4a6bb4e5668

20 files changed, 373 insertions, 292 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index ae8dc7a5..2a297e58 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -31,11 +31,8 @@ TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
 TARGET_2ND_CPU_VARIANT := cortex-a53.a57
 
-TARGET_USES_64_BIT_BINDER := true
-
 # Board
 TARGET_BOARD_PLATFORM := msm8992
-TARGET_BOARD_PLATFORM_GPU := qcom-adreno418
 TARGET_BOARD_INFO_FILE := $(DEVICE_PATH)/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := msm8992
 TARGET_NO_BOOTLOADER := true
@@ -56,15 +53,15 @@ USE_XML_AUDIO_POLICY_CONF := 1
 # Bionic
 TARGET_LD_SHIM_LIBS := \
     /system/vendor/lib64/libril-qc-qmi-1.so|rild_socket.so \
-    /system/vendor/lib/libmmcamera2_stats_algorithm.so|libshim_atomic.so
+    /system/vendor/lib/libmmcamera2_stats_algorithm.so|libshim_atomic.so \
+    /system/vendor/lib64/libizat_core.so|libshims_get_process_name.so \
+    /system/vendor/lib64/liblowi_wifihal_nl.so|libshims_is_wifi_driver_loaded.so
 
 # Bluetooth
-BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_QCOM := true
 BOARD_HAS_QCA_BT_ROME := true
 QCOM_BT_USE_BTNV := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
-BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED := false
 
 # Camera
 USE_DEVICE_SPECIFIC_CAMERA := true
@@ -73,7 +70,6 @@ TARGET_CAMERASERVICE_CLOSES_NATIVE_HANDLES := true
 
 # Charger
 BOARD_CHARGER_ENABLE_SUSPEND := true
-WITH_LINEAGE_CHARGER := false
 
 # CNE
 BOARD_USES_QCNE := true
@@ -97,7 +93,6 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 OVERRIDE_RS_DRIVER := libRSDriver_adreno.so
 TARGET_USES_C2D_COMPOSITION := true
 TARGET_USES_ION := true
-USE_OPENGL_RENDERER := true
 TARGET_USES_GRALLOC1_ADAPTER := true
 TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true
 TARGET_USES_HWC2 := true
@@ -107,8 +102,9 @@ MAX_VIRTUAL_DISPLAY_DIMENSION := 2048
 TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs
 
 # GPS
-BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := $(TARGET_BOARD_PLATFORM)
-BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET := true
+TARGET_NO_RPC := true
+USE_DEVICE_SPECIFIC_GPS := true
+USE_DEVICE_SPECIFIC_LOC_API := true
 
 # Headers
 TARGET_SPECIFIC_HEADER_PATH += $(DEVICE_PATH)/include
@@ -119,24 +115,17 @@ BOARD_KERNEL_PAGESIZE := 4096
 BOARD_KERNEL_TAGS_OFFSET := 0x00000100
 BOARD_RAMDISK_OFFSET     := 0x02000000
 BOARD_KERNEL_IMAGE_NAME := Image-dtb
-BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 boot_cpus=0-5
+BOARD_KERNEL_CMDLINE := androidboot.console=ttyHSL0 androidboot.hardware=qcom
+BOARD_KERNEL_CMDLINE += user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3
+BOARD_KERNEL_CMDLINE += lpm_levels.sleep_disabled=1
 BOARD_MKBOOTIMG_ARGS := --ramdisk_offset $(BOARD_RAMDISK_OFFSET) --tags_offset $(BOARD_KERNEL_TAGS_OFFSET)
 TARGET_KERNEL_CONFIG := libra_defconfig
-TARGET_KERNEL_HEADER_ARCH := arm64
 TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android-
-TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_SOURCE := kernel/xiaomi/msm8992
 
-# Keymaster
-TARGET_KEYMASTER_WAIT_FOR_QSEE := true
-TARGET_PROVIDES_KEYMASTER := true
-
 # Lights
 TARGET_PROVIDES_LIBLIGHT := true
 
-# QTI
-TARGET_PROVIDES_QTI_TELEPHONY_JAR := true
-
 # Lineage Hardware
 BOARD_HARDWARE_CLASS += \
     $(DEVICE_PATH)/lineagehw
@@ -178,7 +167,6 @@ TARGET_INIT_VENDOR_LIB := libinit_msm
 
 # Wifi
 BOARD_HAS_QCOM_WLAN              := true
-BOARD_HAS_QCOM_WLAN_SDK          := true
 BOARD_HOSTAPD_DRIVER             := NL80211
 BOARD_HOSTAPD_PRIVATE_LIB        := lib_driver_cmd_qcwcn
 BOARD_WLAN_DEVICE                := qcwcn
diff --git a/aicp.dependencies b/aicp.dependencies
index 852495de..8f7efcce 100644
--- a/aicp.dependencies
+++ b/aicp.dependencies
@@ -1,17 +1,12 @@
 [
-  {
-    "repository": "LineageOS/android_device_qcom_common",
-    "target_path": "device/qcom/common",
-    "branch": "lineage-15.1"
-  },
-    {
-    "repository": "AICP/proprietary_vendor_xiaomi",
-    "target_path": "vendor/xiaomi",
-    "branch": "o8.1"
-  },
-  {
-    "repository": "Demon000/kernel_xiaomi_msm8992",
-    "target_path": "kernel/xiaomi/msm8992",
-    "branch": "lineage-15.1"
-  }
+ {
+   "repository": "AICP/proprietary_vendor_xiaomi",
+   "target_path": "vendor/xiaomi",
+   "branch": "o8.1"
+ },
+ {
+   "repository": "Demon000/kernel_xiaomi_msm8992",
+   "target_path": "kernel/xiaomi/msm8992",
+   "branch": "lineage-15.1"
+ }
 ]
diff --git a/aicp.mk b/aicp.mk
index 12fd4270..19b16d42 100644
--- a/aicp.mk
+++ b/aicp.mk
@@ -1,6 +1,5 @@
-
 #
-# Copyright 2017 The AICP Project
+# Copyright (C) 2017 The AICP Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,21 +18,21 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
-# Inherit from libra device
+# Inherit device configuration
 $(call inherit-product, device/xiaomi/libra/device.mk)
 
 # Inherit some common AICP stuff.
 $(call inherit-product, vendor/aicp/config/common.mk)
 $(call inherit-product, vendor/aicp/config/common_full_phone.mk)
 
-# Set those variables here to overwrite the inherited values.
-BOARD_VENDOR := Xiaomi
-PRODUCT_BRAND := Xiaomi
-PRODUCT_DEVICE := libra
+# Device identifier. This must come after all inclusions
 PRODUCT_NAME := aicp_libra
+PRODUCT_DEVICE := libra
+PRODUCT_BRAND := Xiaomi
+PRODUCT_MODEL := Mi-4c
 PRODUCT_MANUFACTURER := Xiaomi
 PRODUCT_RESTRICT_VENDOR_FILES := false
-PRODUCT_MODEL := Mi-4c
+
 TARGET_VENDOR := Xiaomi
 
 PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
@@ -41,16 +40,9 @@ PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
 # Boot animation
 TARGET_SCREEN_HEIGHT := 1920
 TARGET_SCREEN_WIDTH := 1080
-#-include vendor/aicp/config/bootanimation.mk
 
 # AICP Device Maintainers
 PRODUCT_BUILD_PROP_OVERRIDES += \
     DEVICE_MAINTAINERS="Demon000 (Cosmin Tanislav) & csolanol (Carlos Solano)"
 
-# Fingerprint
-PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRIVATE_BUILD_DESC="libra-user 7.0 NRD90M V9.5.2.0.NXKCNFA release-keys"
-
-BUILD_FINGERPRINT := Xiaomi/libra/libra:7.0/NRD90M/V9.5.2.0.NXKCNFA:user/release-keys
-
 TARGET_OTA_ASSERT_DEVICE := libra
diff --git a/configs/gps/izat.conf b/configs/gps/izat.conf
index e773eaec..e972a66b 100644
--- a/configs/gps/izat.conf
+++ b/configs/gps/izat.conf
@@ -4,16 +4,6 @@
 # OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5
 IZAT_DEBUG_LEVEL = 2
 
-########################################
-# NLP/WIFI positioning options bit mask
-########################################
-# Enable NLP fixes for WIPER/ODCPI feature => WIPER = 0x1
-# Enable free wifi scan injections for GEOFENCE => FREE_WIFI = 0x2
-# Enable SUPL2 MLD wifi => SUPL_WIFI = 0x4
-# Enable Attached Wifi AP info injection for GEOFENCE => FREE_AP_INFO = 0x8
-# default = WIPER | FREE_WIFI | SUPL_WIFI | FREE_AP_INFO
-NLP_WIFI_LISTENER_MODE = 15
-
 ##################################################
 # Select WIFI Wait Timeout value in seconds for SUPL
 ##################################################
@@ -22,7 +12,7 @@ WIFI_WAIT_TIMEOUT_SELECT = 0
 ################################
 # NLP Settings
 ################################
-# NLP_MODE  1: GNP Only, 2: QNP Only, 3: Combo
+# NLP_MODE  1: OSNLP Only, 2: QNP Only, 3: Combo, 4: QNP preferred
 # NLP_TOLERANCE_TIME_FIRST: Time in ms used in Combo mode
 # to determine how much Tolerance for first position
 # NLP_TOLERANCE_TIME_AFTER: Time in ms used in Combo mode
@@ -32,12 +22,22 @@ WIFI_WAIT_TIMEOUT_SELECT = 0
 # NLP_ACCURACY_MULTIPLE: Determines how far off the accuracy
 # must be, in multiples, between two NLP location reports to
 # be considered much worse accuracy. Used in switching logic
-NLP_MODE = 3
+# NLP COMBO MODE USES QNP WITH NO EULA CONSENT: Determines
+# whether or not to still send network location requests to
+# QNP when the EULA is not consented to by the user. QNP can
+# still return ZPP locations or injected locations even
+# without EULA consent, but the uncertainty can be high.
+# QNP preferred mode prefers QNP when there is EULA consent,
+# otherwise OSNLP is used.
+NLP_MODE = 1
+NLP_MODE_EMERGENCY = 2
 NLP_TOLERANCE_TIME_FIRST = 5000
 NLP_TOLERANCE_TIME_AFTER = 20000
 NLP_THRESHOLD = 3
 NLP_ACCURACY_MULTIPLE = 2
 NLP_COMBO_MODE_USES_QNP_WITH_NO_EULA_CONSENT = 1
+#OSNLP_PACKAGE = com.google.android.gms
+#OSNLP_ACTION = com.android.location.service.v3.NetworkLocationProvider
 REGION_OSNLP_PACKAGE = com.google.android.gms
 REGION_OSNLP_ACTION = com.android.location.service.v3.NetworkLocationProvider
 
@@ -90,17 +90,36 @@ GTP_WAA=DISABLED
 # DISABLED
 # BASIC
 # PREMIUM
-SAP=PREMIUM
+SAP=BASIC
 
-#PIP valid modes:
-# DISABLED
-# PREMIUM
-PIP=DISABLED
+#ODCPI valid modes:
+#DISABLED
+#BASIC
+ODCPI=BASIC
+
+#FREE_WIFI_SCAN_INJECT valid modes:
+#DISABLED
+#BASIC
+FREE_WIFI_SCAN_INJECT=BASIC
+
+#SUPL_WIFI valid modes:
+#DISABLED
+#BASIC
+SUPL_WIFI=BASIC
+
+#WIFI_SUPPLICANT_INFO valid modes:
+#DISABLED
+#BASIC
+WIFI_SUPPLICANT_INFO=BASIC
 
 #####################################
 # Location process launcher settings
 #####################################
 
+# DO NOT MODIFY
+# Modifying below attributes without
+# caution can have serious implications.
+
 #Values for PROCESS_STATE:
 # ENABLED
 # DISABLED
@@ -110,37 +129,61 @@ PIP=DISABLED
 # GTP-AP-CELL 0X0c
 # GTP-MP-CELL 0xc00
 # GTP-WAA     0X300
-# PIP         0x30
 # SAP         0Xc0
+# ODCPI      0x1000
+# FREE_WIFI_SCAN_INJECT   0x2000
+# SUPL_WIFI   0x4000
+# WIFI_SUPPLICANT_INFO   0x8000
 
 #Values for PLATFORMS can be:
 #1. Any valid values obtained from ro.board.platform separated by single space. For example: msm8960 msm8226
-#2. all -> for All platforms
+#2. 'all' or 'all exclude' -> for All platforms
+#3. 'all exclude XXXX' -> All platforms exclude XXXX. For example: all exclude msm8937
 
 #Values for BASEBAND can be:
 #1. Any valid values obtained from ro.baseband separated by single space. For example: sglte sglte2
-#2. all -> for all basebands
-
-PROCESS_NAME=/vendor/bin/location-mq
+#2. 'all' or 'all exclude' -> for all basebands
+#3. 'all exclude XXXX' -> All basebands exclude XXXX. For example: all exclude sglte
+
+#Valyes for LEAN_TARGETS can be:
+#ENABLED  -> if this process is supposed to run on lean and mean targets
+#DISABLED -> if this process is to be disabled on lean and mean targets
+PROCESS_NAME=/vendor/bin/garden_app
+PROCESS_ARGUMENT=-u 0 -q 0 -j 0 -g 0 -l 0 -Z 0 -T 1
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps
+PROCESS_GROUPS=gps net_raw
 PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0xf3f
+IZAT_FEATURE_MASK=0
 PLATFORMS=all
-BASEBAND=all
+BASEBAND=auto
+LEAN_TARGETS=DISABLED
 
 PROCESS_NAME=/vendor/bin/lowi-server
+PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
 PROCESS_GROUPS=gps net_admin wifi inet oem_2950 net_raw
 PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0x333
+IZAT_FEATURE_MASK=0xf303
+PLATFORMS=all
+BASEBAND=all
+LEAN_TARGETS=DISABLED
+
+PROCESS_NAME=/vendor/bin/xtwifi-inet-agent
+PROCESS_ARGUMENT=
+PROCESS_STATE=ENABLED
+PROCESS_GROUPS=inet gps
+PREMIUM_FEATURE=1
+IZAT_FEATURE_MASK=0xc0f
 PLATFORMS=all
 BASEBAND=all
+LEAN_TARGETS=DISABLED
 
-PROCESS_NAME=/vendor/bin/slim_daemon
+PROCESS_NAME=/vendor/bin/xtwifi-client
+PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps net_raw oem_2950
+PROCESS_GROUPS=net_admin wifi inet gps net_raw oem_2952 system
 PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0xf0
+IZAT_FEATURE_MASK=0xf0f
 PLATFORMS=all
 BASEBAND=all
+LEAN_TARGETS=DISABLED
diff --git a/configs/gps/lowi.conf b/configs/gps/lowi.conf
deleted file mode 100644
index 6ab04bbb..00000000
--- a/configs/gps/lowi.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-#*====*====*====*====*====*====*====*====*====*====*====*====*====*====*====*
-#
-# LOWI Config file
-#
-# GENERAL DESCRIPTION
-#  This file contains the config params for LOWI
-#
-# Copyright (c) 2012-2013 Qualcomm Atheros, Inc.
-#  All Rights Reserved.
-#  Qualcomm Atheros Confidential and Proprietary.
-#
-# Export of this technology or software is regulated by the U.S. Government.
-# Diversion contrary to U.S. law prohibited.
-#=============================================================================*/
-
-# X86 ONLY - UBUNTU:
-# Copy this file in the same directory where the executable is
-
-# The RSSI threshold used in the RTT outlier detection in half decibels. Default value recommended by the
-# system team currently is -140 (corresponding to -70 dB).
-LOWI_RSSI_THRESHOLD_FOR_RTT = -140
-
-# Number of measurment per AP for RTS/CTS
-LOWI_RTS_CTS_NUM_MEAS = 5
-
-# Maximum Number of Outstanding Requests supported
-LOWI_MAX_OUTSTANDING_REQUEST = 255
-
-# Maximum number of records in Cache
-LOWI_MAX_NUM_CACHE_RECORDS = 200
-
-# Default threshold before issuing another fresh scan (ms)
-LOWI_FRESH_SCAN_THRESHOLD = 500
-
-# Timeout in case no result is reported by the driver (seconds)
-LOWI_NO_RESULT_WAIT_TOLERANCE = 10
-
-# Use Fake Wifi driver. Only valid for engineering builds
-LOWI_USE_FAKE_WIFI_DRIVER = 0
-
-# Use ROME Wifi driver. Only valid for engineering builds
-# Will be removed later only for development support
-LOWI_USE_ROME_WIFI_DRIVER = 0
-
-# Use LOWI LP.
-# When enabled the Discovery Request will be routed to LOWI-LP
-LOWI_USE_LOWI_LP = 0
-
-# Log level
-# EL_LOG_OFF = 0, EL_ERROR = 1, EL_WARNING = 2, EL_INFO = 3, EL_DEBUG = 4, EL_VERBOSE = 5, EL_LOG_ALL = 100
-LOWI_LOG_LEVEL = 2
diff --git a/configs/gps/sap.conf b/configs/gps/sap.conf
index 831d1674..596c60eb 100644
--- a/configs/gps/sap.conf
+++ b/configs/gps/sap.conf
@@ -34,13 +34,13 @@ SENSOR_CONTROL_MODE=0
 SENSOR_USAGE=0
 
 # Choose GSIFF sensor provider (1=Snapdragon Sensors Core, 2=Android NDK)
-SENSOR_PROVIDER=2
+SENSOR_PROVIDER=1
 
 # Bit mask used to define which sensor algorithms are used.
 # Setting each bit has the following definition:
 #  0x1 - DISABLE_INS_POSITIONING_FILTER
 #  0x0 - ENABLE_INS_POSITIONING_FILTER
-SENSOR_ALGORITHM_CONFIG_MASK=0x0
+SENSOR_ALGORITHM_CONFIG_MASK=0x1
 
 # Time source used by Sensor HAL
 # Setting this value controls accuracy of location sensor services.
@@ -49,5 +49,5 @@ SENSOR_ALGORITHM_CONFIG_MASK=0x0
 #  2 - CLOCK_MONOTONIC
 #  3 - CLOCK_REALTIME
 #  4 - CLOCK_BOOTTIME using Alarm timer interface
-NDK_PROVIDER_TIME_SOURCE=0
+NDK_PROVIDER_TIME_SOURCE=1
 
diff --git a/configs/sec_config b/configs/sec_config
index 18bfd120..145c6adc 100644
--- a/configs/sec_config
+++ b/configs/sec_config
@@ -1,16 +1,10 @@
 /* IPC Security Config */
 /* <GPS QMI Service ID - 16>:<GPS QMI Instance ID - all instances>:<Client Group ID> */
 16:4294967295:1000:3004
-704:4294967295:1000
-701:4294967295:1001
 /* Allow SS CTL service to be used by system and net_raw processes */
 43:4294967295:1000:3004
 /* <UIMRMT QMI Service ID - 16>:<UIMRMT QMI Instance ID - all instances>:<Client Group ID> */
 50:4294967295:1001
-/* QMI-SLIM service permitted to gps and net_raw */
-55:4294967295:1021:3004
-/* <LOWI QMI Service ID - 38>:<LOWI QMI Instance ID - all instances>:<Client Group ID> */
-56:4294967295:1021:3004
 /* Allow Sensor services to be used by sensor process */
 256:4294967295:3011
 257:4294967295:3011
diff --git a/device.mk b/device.mk
index 8a3034b5..202435a9 100644
--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2015 The Android Open-Source Project
+# Copyright (C) 2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +16,12 @@
 #
 
 # Overlays
-DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
+DEVICE_PACKAGE_OVERLAYS :=  \
+    $(LOCAL_PATH)/overlay \
+    $(LOCAL_PATH)/overlay-lineage
+
+PRODUCT_ENFORCE_RRO_TARGETS := \
+    framework-res
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 1920
@@ -59,6 +65,7 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += \
     android.hardware.audio@2.0-impl \
+    android.hardware.audio@2.0-service \
     android.hardware.audio.effect@2.0-impl \
     android.hardware.soundtrigger@2.0-impl
 
@@ -163,14 +170,14 @@ PRODUCT_PACKAGES += \
 
 # GPS
 PRODUCT_PACKAGES += \
-    android.hardware.gnss@1.0-impl \
-    gps.msm8992
+    libshims_get_process_name \
+    libshims_is_wifi_driver_loaded \
+    android.hardware.gnss@1.0-impl
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/gps/flp.conf:system/etc/flp.conf \
     $(LOCAL_PATH)/configs/gps/gps.conf:system/etc/gps.conf \
     $(LOCAL_PATH)/configs/gps/izat.conf:system/etc/izat.conf \
-    $(LOCAL_PATH)/configs/gps/izat.conf:system/etc/lowi.conf \
     $(LOCAL_PATH)/configs/gps/sap.conf:system/etc/sap.conf
 
 PRODUCT_COPY_FILES += \
@@ -231,6 +238,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.light@2.0-service.libra
 
+# LiveDisplay native
+PRODUCT_PACKAGES += \
+    vendor.lineage.livedisplay@1.0-service-legacymm
+
 # Media
 PRODUCT_PACKAGES += \
     libc2dcolorconvert \
@@ -258,7 +269,6 @@ PRODUCT_PACKAGES += \
     ethertypes \
     libbson \
     libcnefeatureconfig \
-    libqsap_sdk \
     librmnetctl \
     libxml2
 
@@ -324,7 +334,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \
     readmac \
-    dhcpcd.conf \
     wificond \
     hostapd \
     libwpa_client \
diff --git a/manifest.xml b/manifest.xml
index e6080acd..57e8426f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -35,4 +35,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.lineage.livedisplay</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IColor</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>
diff --git a/modules/init/init_msm.cpp b/modules/init/init_msm.cpp
index e100b5c0..ac4fc85a 100644
--- a/modules/init/init_msm.cpp
+++ b/modules/init/init_msm.cpp
@@ -45,6 +45,13 @@ void property_override(char const prop[], char const value[])
         __system_property_add(prop, strlen(prop), value, strlen(value));
 }
 
+void property_override_dual(char const system_prop[],
+        char const vendor_prop[], char const value[])
+{
+    property_override(system_prop, value);
+    property_override(vendor_prop, value);
+}
+
 char const *heapstartsize;
 char const *heapgrowthlimit;
 char const *heapsize;
@@ -107,17 +114,17 @@ void vendor_load_properties()
 
     switch(board_id) {
     case LIBRA_BOARD_ID:
-        property_override("ro.product.model", "Mi4c");
-        property_override("ro.product.device", "libra");
+        property_override_dual("ro.product.model", "ro.vendor.product.model", "Mi4c");
+        property_override_dual("ro.product.device", "ro.vendor.product.device", "libra");
         property_override("ro.build.description", "libra-user 7.0 NRD90M V9.5.2.0.NXKCNFA release-keys");
-        property_override("ro.build.fingerprint", "Xiaomi/libra/libra:7.0/NRD90M/V9.5.2.0.NXKCNFA:user/release-keys");
+        property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "Xiaomi/libra/libra:7.0/NRD90M/V9.5.2.0.NXKCNFA:user/release-keys");
         property_override("ro.build.product", "libra");
         break;
     case AQUA_BOARD_ID:
-        property_override("ro.product.model", "Mi4s");
-        property_override("ro.product.device", "aqua");
+        property_override_dual("ro.product.model", "ro.vendor.product.model", "Mi4s");
+        property_override_dual("ro.product.device", "ro.vendor.product.device", "aqua");
         property_override("ro.build.description", "aqua-user 7.0 NRD90M V9.5.2.0.NXKCNFA release-keys");
-        property_override("ro.build.fingerprint", "Xiaomi/aqua/aqua:7.0/NRD90M/V9.5.2.0.NXKCNFA:user/release-keys");
+        property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "Xiaomi/aqua/aqua:7.0/NRD90M/V9.5.2.0.NXKCNFA:user/release-keys");
         property_override("ro.build.product", "aqua");
         property_set("ro.boot.fingerprint", "fpc");
         break;
diff --git a/modules/libshim/Android.mk b/modules/libshim/Android.mk
index a23fe214..7327ec7b 100644
--- a/modules/libshim/Android.mk
+++ b/modules/libshim/Android.mk
@@ -18,3 +18,16 @@ LOCAL_SRC_FILES := atomic.cpp
 LOCAL_MODULE := libshim_atomic
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := get_process_name.c
+LOCAL_MODULE := libshims_get_process_name
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := is_wifi_driver_loaded.cpp
+LOCAL_MODULE := libshims_is_wifi_driver_loaded
+LOCAL_MODULE_TAGS := optional
+LOCAL_SHARED_LIBRARIES := libwifi-hal
+include $(BUILD_SHARED_LIBRARY)
diff --git a/modules/libshim/get_process_name.c b/modules/libshim/get_process_name.c
new file mode 100644
index 00000000..a25985ca
--- /dev/null
+++ b/modules/libshim/get_process_name.c
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2017 The LineageOS 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.
+ */
+
+static const char* process_name = "unknown";
+
+const char* get_process_name(void) {
+    return process_name;
+}
diff --git a/modules/libshim/is_wifi_driver_loaded.cpp b/modules/libshim/is_wifi_driver_loaded.cpp
new file mode 100644
index 00000000..337d0e10
--- /dev/null
+++ b/modules/libshim/is_wifi_driver_loaded.cpp
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2017 The LineageOS 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.
+ */
+
+extern "C" {
+#include <hardware_legacy/wifi_hal.h>
+}
diff --git a/modules/light/Light.cpp b/modules/light/Light.cpp
index f551a71f..a95cbab0 100644
--- a/modules/light/Light.cpp
+++ b/modules/light/Light.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,6 @@
 
 #include <fstream>
 
-namespace android {
-namespace hardware {
-namespace light {
-namespace V2_0 {
-namespace implementation {
-
 #define LEDS            "/sys/class/leds/"
 
 #define LCD_LED         LEDS "lcd-backlight/"
@@ -59,6 +53,7 @@ namespace implementation {
  */
 static int32_t BRIGHTNESS_RAMP[RAMP_STEPS] = {0, 12, 25, 37, 50, 72, 85, 100};
 
+namespace {
 /*
  * Write value to path and close file.
  */
@@ -173,29 +168,60 @@ static void handleNotification(const LightState& state) {
     }
 }
 
-static std::map<Type, std::function<void(const LightState&)>> lights = {
-    {Type::BACKLIGHT, handleBacklight},
-    {Type::BUTTONS, handleButtons},
-    {Type::BATTERY, handleNotification},
-    {Type::NOTIFICATIONS, handleNotification},
-    {Type::ATTENTION, handleNotification},
+static inline bool isLit(const LightState& state) {
+    return state.color & 0x00ffffff;
+}
+
+/* Keep sorted in the order of importance. */
+static std::vector<LightBackend> backends = {
+    { Type::ATTENTION, handleNotification },
+    { Type::NOTIFICATIONS, handleNotification },
+    { Type::BATTERY, handleNotification },
+    { Type::BACKLIGHT, handleBacklight },
+    { Type::BUTTONS, handleButtons },
 };
 
-Light::Light() {}
+}  // anonymous namespace
+
+namespace android {
+namespace hardware {
+namespace light {
+namespace V2_0 {
+namespace implementation {
 
 Return<Status> Light::setLight(Type type, const LightState& state) {
-    auto it = lights.find(type);
+    LightStateHandler handler;
+    bool handled = false;
+
+    /* Lock global mutex until light state is updated. */
+    std::lock_guard<std::mutex> lock(globalLock);
 
-    if (it == lights.end()) {
+    /* Update the cached state value for the current type. */
+    for (LightBackend& backend : backends) {
+        if (backend.type == type) {
+            backend.state = state;
+            handler = backend.handler;
+        }
+    }
+
+    /* If no handler has been found, then the type is not supported. */
+    if (!handler) {
         return Status::LIGHT_NOT_SUPPORTED;
     }
 
-    /*
-     * Lock global mutex until light state is updated.
-     */
-    std::lock_guard<std::mutex> lock(globalLock);
+    /* Light up the type with the highest priority that matches the current handler. */
+    for (LightBackend& backend : backends) {
+        if (handler == backend.handler && isLit(backend.state)) {
+            handler(backend.state);
+            handled = true;
+            break;
+        }
+    }
 
-    it->second(state);
+    /* If no type has been lit up, then turn off the hardware. */
+    if (!handled) {
+        handler(state);
+    }
 
     return Status::SUCCESS;
 }
@@ -203,7 +229,9 @@ Return<Status> Light::setLight(Type type, const LightState& state) {
 Return<void> Light::getSupportedTypes(getSupportedTypes_cb _hidl_cb) {
     std::vector<Type> types;
 
-    for (auto const& light : lights) types.push_back(light.first);
+    for (const LightBackend& backend : backends) {
+        types.push_back(backend.type);
+    }
 
     _hidl_cb(types);
 
diff --git a/modules/light/Light.h b/modules/light/Light.h
index 7c80f6fc..24d8385c 100644
--- a/modules/light/Light.h
+++ b/modules/light/Light.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef ANDROID_HARDWARE_LIGHT_V2_0_LIGHT_H
 #define ANDROID_HARDWARE_LIGHT_V2_0_LIGHT_H
 
@@ -21,25 +22,36 @@
 #include <hidl/Status.h>
 #include <map>
 #include <mutex>
-
-namespace android {
-namespace hardware {
-namespace light {
-namespace V2_0 {
-namespace implementation {
+#include <vector>
 
 using ::android::hardware::Return;
 using ::android::hardware::Void;
-using ::android::hardware::hidl_vec;
+using ::android::hardware::light::V2_0::Flash;
 using ::android::hardware::light::V2_0::ILight;
 using ::android::hardware::light::V2_0::LightState;
 using ::android::hardware::light::V2_0::Status;
 using ::android::hardware::light::V2_0::Type;
 
+typedef void (*LightStateHandler)(const LightState&);
+
+struct LightBackend {
+    Type type;
+    LightState state;
+    LightStateHandler handler;
+
+    LightBackend(Type type, LightStateHandler handler) : type(type), handler(handler) {
+        this->state.color = 0xff000000;
+    }
+};
+
+namespace android {
+namespace hardware {
+namespace light {
+namespace V2_0 {
+namespace implementation {
+
 class Light : public ILight {
    public:
-    Light();
-
     Return<Status> setLight(Type type, const LightState& state) override;
     Return<void> getSupportedTypes(getSupportedTypes_cb _hidl_cb) override;
 
diff --git a/overlay/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
index 71056a96..7987cb18 100644
--- a/overlay/lineage-sdk/lineage/res/res/values/config.xml
+++ b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
@@ -31,17 +31,44 @@
          This integer should equal the sum of the corresponding value for each
          of the following capabilities present:
 
+         // Device has a color adjustable battery light.
          LIGHTS_RGB_NOTIFICATION_LED = 1
+
+         // Device has a color adjustable notification light.
          LIGHTS_RGB_BATTERY_LED = 2
+
          LIGHTS_MULTIPLE_NOTIFICATION_LED = 4 (deprecated)
+
+         // The notification light has adjustable pulsing capability.
          LIGHTS_PULSATING_LED = 8
+
+         // Device has a multi-segment battery light that is able to
+         // use the light brightness value to determine how many
+         // segments to show (in order to represent battery level).
          LIGHTS_SEGMENTED_BATTERY_LED = 16
+
+         // The notification light supports HAL adjustable brightness
+         // via the alpha channel.
+         // Note: if a device notification light supports LIGHTS_RGB_NOTIFICATION_LED
+         // then HAL support is not necessary for brightness control.  In this case,
+         // brightness support will be provided by lineage-sdk through the scaling of
+         // RGB color values.
          LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS = 32
+
+         // Device has a battery light.
          LIGHTS_BATTERY_LED = 64
 
+         // The battery light supports HAL adjustable brightness via
+         // the alpha channel.
+         // Note: if a device battery light supports LIGHTS_RGB_BATTERY_LED then HAL
+         // support is not necessary for brightness control.  In this case,
+         // brightness support will be provided by lineage-sdk through the scaling of
+         // RGB color values.
+         LIGHTS_ADJUSTABLE_BATTERY_LED_BRIGHTNESS = 128
+
          For example, a device with notification and battery lights that supports
          pulsating and RGB control would set this config to 75. -->
-    <integer name="config_deviceLightCapabilities" translatable="false">107</integer>
+    <integer name="config_deviceLightCapabilities" translatable="false">235</integer>
 
     <!-- Hardware keys present on the device, stored as a bit field.
          This integer should equal the sum of the corresponding value for each
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 7959f67e..e5dfc77c 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -341,6 +341,10 @@
     -->
     <bool name="config_enableWifiDisplay">true</bool>
 
+    <!-- Enable overlay for all location components. -->
+    <string name="config_networkLocationProviderPackageName" translatable="false">com.qualcomm.location</string>
+    <string name="config_fusedLocationProviderPackageName" translatable="false">com.qualcomm.location</string>
+
     <!-- Whether device supports double tap to wake -->
     <bool name="config_supportDoubleTapWake">true</bool>
 
@@ -351,9 +355,13 @@
     <!-- Default list of files pinned by the Pinner Service -->
     <string-array translatable="false" name="config_defaultPinnerServiceFiles">
         <item>"/system/framework/arm64/boot-framework.oat"</item>
+        <item>"/system/framework/arm64/boot-framework.vdex"</item>
         <item>"/system/framework/oat/arm64/services.odex"</item>
+        <item>"/system/framework/oat/arm64/services.vdex"</item>
         <item>"/system/framework/arm64/boot.oat"</item>
+        <item>"/system/framework/arm64/boot.vdex"</item>
         <item>"/system/framework/arm64/boot-core-libart.oat"</item>
+        <item>"/system/framework/arm64/boot-core-libart.vdex"</item>
         <item>"/data/dalvik-cache/arm64/system@framework@boot.oat"</item>
         <item>"/data/dalvik-cache/arm64/system@framework@services.jar@classes.dex"</item>
     </string-array>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 288e4a4c..4383b34c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -27,16 +27,9 @@ vendor/lib/libsurround_3mic_proc.so
 vendor/lib/soundfx/libqcbassboost.so
 vendor/lib/soundfx/libqcreverb.so
 vendor/lib/soundfx/libqcvirt.so
-vendor/lib64/libacdb-fts.so
-vendor/lib64/libacdbloader.so
-vendor/lib64/libacdbrtac.so
-vendor/lib64/libadiertac.so
-vendor/lib64/libaudcal.so
 
 # Bluetooth
-bin/port-bridge:vendor/bin/port-bridge
 bin/wcnss_filter:vendor/bin/wcnss_filter
-vendor/lib/libbtnv.so
 vendor/lib64/libbtnv.so
 
 # Camera
@@ -275,11 +268,6 @@ vendor/lib/libmmcamera_s5k3m2xm_eeprom.so
 vendor/lib/libmmcamera_s5k3m2xm_ofilm_eeprom.so
 
 # Camera firmware
-etc/firmware/cpp_firmware_v1_1_1.fw
-etc/firmware/cpp_firmware_v1_1_6.fw
-etc/firmware/cpp_firmware_v1_2_0.fw
-etc/firmware/cpp_firmware_v1_4_0.fw
-etc/firmware/cpp_firmware_v1_6_0.fw
 etc/firmware/cpp_firmware_v1_8_0.fw
 
 # Camera sensors
@@ -291,30 +279,15 @@ vendor/lib/libmmcamera_s5k3m2xm.so
 vendor/lib/libmmcamera_s5k3m2xm_ofilm.so
 
 # CNE
-etc/permissions/com.quicinc.cne.xml|e99e631d8b06ba4680529e9e4004d8d05baf6904
-framework/com.quicinc.cne.api-V1.0-java.jar|6fb1bf2ea642ce0f0c8c4716639cab7a9810cc3e
-framework/com.quicinc.cne.jar|88fc21cd7dd69ae37607a9a671d4913d82c2e336
 vendor/bin/cnd|fc7ad0d8041e35df029531ad6b5e972fdbfbfbc3
--vendor/lib/com.quicinc.cne.api@1.0.so|60dd6f1fa0c70523f91342b07be6c82e733cdb90
--vendor/lib/com.quicinc.cne.constants@1.0.so|0d3b2fd95e8ea3525467d8ca38865ac2a9d3f4c7
--vendor/lib/com.quicinc.cne.constants@2.0.so|0f5cdca41024ece0b3c7006113e4f11c5b00b9c3
--vendor/lib/com.quicinc.cne.server@1.0.so|e9c404ca3e334302b5460ff6a1622d14e2bc9ecb
--vendor/lib/com.quicinc.cne.server@2.0.so|89b5b0ef6e281c009b8e8b91efa07eff739e44c1
-vendor/lib/libcne.so|029ae86dcaeff004bcf0548d2bd5a7aed2229915
-vendor/lib/libcneapiclient.so|f97d23653b7ed72694800eb45cd5a78663e17c45
-vendor/lib/libcneqmiutils.so|c26f228cbe2cce4f66d4510646815041205a67f4
-vendor/lib/libwqe.so|822420ff564e63da07ea841d408655338e0ad51a
-vendor/lib/libxml.so|288082cac5396bdb5e10f2014d99972f9e43e65c
--vendor/lib64/com.quicinc.cne.api@1.0.so|503825cc8a3c0d422e16e04b398d2c1924e518ca
--vendor/lib64/com.quicinc.cne.constants@1.0.so|a60fde6f9328635bf43bb7008dd9517e4e749e8b
--vendor/lib64/com.quicinc.cne.constants@2.0.so|3c5682f16cfe136766c5ccba7f5d340c915b634f
--vendor/lib64/com.quicinc.cne.server@1.0.so|97c3c68a96551d8d2b40b72ceba06f28af0d6ebe
--vendor/lib64/com.quicinc.cne.server@2.0.so|9a2de7d1ce79058f547bd4c64ee7976af9a414c5
+vendor/lib64/com.quicinc.cne.api@1.0.so|503825cc8a3c0d422e16e04b398d2c1924e518ca
+vendor/lib64/com.quicinc.cne.constants@1.0.so|a60fde6f9328635bf43bb7008dd9517e4e749e8b
+vendor/lib64/com.quicinc.cne.constants@2.0.so|3c5682f16cfe136766c5ccba7f5d340c915b634f
+vendor/lib64/com.quicinc.cne.server@2.0.so|9a2de7d1ce79058f547bd4c64ee7976af9a414c5
 vendor/lib64/libcne.so|edcd7d8f33a86082ef9890d28a9c4bb75185a3ab
 vendor/lib64/libcneapiclient.so|33e7465996749a8823ac03e34a94e3112c88dda4
 vendor/lib64/libcneqmiutils.so|41bf6f87336faaee239a3047b1fdac3f742ebde9
 vendor/lib64/libwqe.so|0ca87bc277c645fea7dbfd50504f7a6097c08d98
-vendor/lib64/libxml.so|b966ad575b2078dd09a0e5fdc2fb428a1ffe31fc
 
 # Dirac
 lib/libDiracAPI_SHARED.so
@@ -322,8 +295,6 @@ lib/soundfx/libdirac.so
 vendor/etc/diracmobile.config
 
 # Fingerprint
-lib/libcom_fingerprints_service.so|80b7f1c8344bb803173e75ab40ec044fda1d765a
-lib/hw/fingerprint.fpc.so|19387877a750eeab27054e5fabd7b8da12969837
 lib64/libcom_fingerprints_service.so|84184194dc22c7f82892862f142977bc2c81d6eb
 lib64/hw/fingerprint.fpc.so|9cbb143331d590b7931ef379b55d6aff09dd879b
 
@@ -340,67 +311,79 @@ etc/firmware/rampatch_tlv_3.0.tlv
 etc/firmware/rampatch_tlv_3.2.tlv
 
 # Gatekeeper
-vendor/lib/hw/gatekeeper.msm8992.so
 vendor/lib64/hw/gatekeeper.msm8992.so
 
 # GPS
-bin/loc_launcher:vendor/bin/loc_launcher|fc5afe88ffb6a59fb32371fd6555f901ab1350e4
-bin/location-mq:vendor/bin/location-mq|91604af318c77f8b367c0ce9a5937612f6448f80
-bin/lowi-server:vendor/bin/lowi-server|21108f9b5371a2bb9091d52292f66322e888082a
-lib64/libloc_api_v02.so|5e7123b7537820ca216bf032af232fd861afce17
-lib64/libloc_core.so|51ed39286dd07a23785d6dffd89f926f5086b411
-lib64/libloc_ds_api.so|89347db7f9bb3f6c47c3922407dc2a13c9e521fc
-lib64/libloc_eng.so|4fff60cf0a8012602d78d607dc3a3b227ad687de
-vendor/bin/slim_daemon|395c18077437e8b352a6d460e72da6a54f8f5c2f
-vendor/lib64/hw/flp.default.so|40926fa10a036157ba765a8b3ff9987f0ea0b833
-vendor/lib64/libgeofence.so|b0913ed5f5c1ec842d74364b313632dffdd6c628
-vendor/lib64/libizat_core.so|724a9e8567539e72f2629c6e9c98be299b180f47
-vendor/lib64/liblbs_core.so|4357b314a9d9e0b4c1c8bd3ec1b4b6569acb4f78
-vendor/lib64/liblowi_client.so|56d93476edb8c951344e131cea11d32fc773b97c
-vendor/lib64/liblowi_wifihal.so|314d33495539042f20fb285fbb16a36b44faba9c
-vendor/lib64/libquipc_os_api.so|68a4581b50574b8e99d0940a4689e84834e722f0
+bin/garden_app:vendor/bin/garden_app
+bin/loc_launcher:vendor/bin/loc_launcher
+bin/lowi-server:vendor/bin/lowi-server
+bin/xtwifi-client:vendor/bin/xtwifi-client
+bin/xtwifi-inet-agent:vendor/bin/xtwifi-inet-agent
+lib64/hw/gps.default.so:lib64/hw/gps.msm8992.so
+lib64/libgps.utils.so
+lib64/libloc_api_v02.so
+lib64/libloc_core.so
+lib64/libloc_ds_api.so
+lib64/libloc_eng.so
+vendor/lib64/hw/flp.default.so
+vendor/lib64/libasn1cper.so
+vendor/lib64/libasn1crt.so
+vendor/lib64/libasn1crtx.so
+vendor/lib64/libdataitems.so
+vendor/lib64/libflp.so
+vendor/lib64/libgdtap.so
+vendor/lib64/libgeofence.so
+vendor/lib64/libizat_core.so
+vendor/lib64/liblbs_core.so
+vendor/lib64/libloc_ext.so
+vendor/lib64/liblocationservice.so
+vendor/lib64/liblocationservice_glue.so
+vendor/lib64/liblowi_client.so
+vendor/lib64/liblowi_wifihal.so
+vendor/lib64/liblowi_wifihal_nl.so
+vendor/lib64/libquipc_os_api.so
+vendor/lib64/libulp2.so
+vendor/lib64/libxt_native.so
+vendor/lib64/libxtadapter.so
+vendor/lib64/libxtwifi_ulp_adaptor.so
 
 # GPU
-vendor/lib/egl/eglSubDriverAndroid.so|b88e4972d259e1e518793aa8fb9ab9ce7b574137
-vendor/lib/egl/libEGL_adreno.so|c34a55560cbe0dec10736ee48f1d3531b7eb30da
-vendor/lib/egl/libGLESv1_CM_adreno.so|12559bdb260be99259c5114eb18141a6f55ec5c6
-vendor/lib/egl/libGLESv2_adreno.so|99b5d3351ff74dd80ce8788d8cf813f795c004d3
-vendor/lib/egl/libq3dtools_adreno.so|32f28df5844ed9826af5a77d7519db6b5db93ceb
-vendor/lib/hw/vulkan.msm8992.so|8bd98116b5a586839aad4c93468fc04f044d4ef4
-vendor/lib/libadreno_utils.so|4fd27f46943412ddbb69c4e32059a3a765db8b9a
-vendor/lib/libbccQTI.so|7cd380e1ce6c80fa57bec7d9f81f7826382ccea7
-vendor/lib/libC2D2.so|668aaec9820480a9f1b04a6994be28bc4fef5677
-vendor/lib/libc2d30-a4xx.so|e9e4975a5e16e1799cd1883bbb8905ce4b51aa7c
-vendor/lib/libCB.so|ced7d5bfdbb5b5c0cb2b69e67942d568bedff4d5
-vendor/lib/libgsl.so|b90e66e879dfee14997282358ca4cf9cd3cbee83
-vendor/lib/libllvm-glnext.so|18ecddeb137e38ca12563a2b3a39dd2f6df1f68b
-vendor/lib/libllvm-qcom.so|ab8604edbedb9db19ac9f0cfbeb4473adf20b2c5
-vendor/lib/libllvm-qgl.so|ffd2e9c41d8976bf259b6463a1690a516daa458f
+vendor/lib/egl/eglSubDriverAndroid.so
+vendor/lib/egl/libEGL_adreno.so
+vendor/lib/egl/libGLESv1_CM_adreno.so
+vendor/lib/egl/libGLESv2_adreno.so
+vendor/lib/egl/libq3dtools_adreno.so
+vendor/lib/libadreno_utils.so
+vendor/lib/libbccQTI.so
+vendor/lib/libC2D2.so
+vendor/lib/libc2d30-a4xx.so
+vendor/lib/libCB.so
+vendor/lib/libgsl.so
+vendor/lib/libllvm-glnext.so
+vendor/lib/libllvm-qcom.so
 vendor/lib/libOpenCL.so
-vendor/lib/librs_adreno.so|bb1d5cb84f14ed18fcbfb4815692cb196e44f180
-vendor/lib/librs_adreno_sha1.so|be8a817743950dac6e22b50cbd9657c2d35c35f2
-vendor/lib/libRSDriver_adreno.so|ee3386248adfa7d1a8c1107e051bcbbd3e8df0c1
-vendor/lib/libscale.so|d6f14ce071a09b263614f0e68bcbea8192025c50
-vendor/lib64/egl/eglSubDriverAndroid.so|03e2c66eebed80a91b08e2c18d011844682bdd7b
-vendor/lib64/egl/libEGL_adreno.so|3193346e9938e05ce611db0d0f9e456009289ebd
-vendor/lib64/egl/libGLESv1_CM_adreno.so|e429adb54d16ea1e359bc0a56b0a3a7336989a77
-vendor/lib64/egl/libGLESv2_adreno.so|f072b33a708cc81de6e6a2d09741696f8c9ce034
-vendor/lib64/egl/libq3dtools_adreno.so|c5fcb698418bf5aedb15e6cf87a6d649b7f09aba
-vendor/lib64/hw/vulkan.msm8992.so|123f72ad06ab296028dc5d14884453630676027f
-vendor/lib64/libadreno_utils.so|6e6252196f0b510989a6f4f54a4bb3492f56e695
-vendor/lib64/libbccQTI.so|e39a9a997196757a9830dd217dba086581b35a4d
-vendor/lib64/libC2D2.so|da5c955221f736361a3646870600744756a6bd87
-vendor/lib64/libc2d30-a4xx.so|e40a2efbecaccd34970b981bb8d83f3fa58f3cec
-vendor/lib64/libCB.so|7bd8ce62b1f4e52b162481d89b9f4af5e94d588f
-vendor/lib64/libgsl.so|e6435ecf1baae08408a0cc43e1568ce42f1ddb56
-vendor/lib64/libllvm-glnext.so|abbf71eceb4048c63741cc43f2c15d4f8034bffa
-vendor/lib64/libllvm-qcom.so|10fe39e71615629bb5af03794fd0a970f4b700fc
-vendor/lib64/libllvm-qgl.so|192a30d29c1f0c5e2a6f38ca3df58118be85f346
+vendor/lib/librs_adreno.so
+vendor/lib/librs_adreno_sha1.so
+vendor/lib/libRSDriver_adreno.so
+vendor/lib/libscale.so
+vendor/lib64/egl/eglSubDriverAndroid.so
+vendor/lib64/egl/libEGL_adreno.so
+vendor/lib64/egl/libGLESv1_CM_adreno.so
+vendor/lib64/egl/libGLESv2_adreno.so
+vendor/lib64/egl/libq3dtools_adreno.so
+vendor/lib64/libadreno_utils.so
+vendor/lib64/libbccQTI.so
+vendor/lib64/libC2D2.so
+vendor/lib64/libc2d30-a4xx.so
+vendor/lib64/libCB.so
+vendor/lib64/libgsl.so
+vendor/lib64/libllvm-glnext.so
+vendor/lib64/libllvm-qcom.so
 vendor/lib64/libOpenCL.so
-vendor/lib64/librs_adreno.so|18e913b6d8f79e4b8563a8c8a0b2475e609d4813
-vendor/lib64/librs_adreno_sha1.so|ef430803f5b7623d774166d7c6130012f5f24845
-vendor/lib64/libRSDriver_adreno.so|05d94ad793ba74c1f6635762eb7871a611001c9c
-vendor/lib64/libscale.so|993c923e266f41d268eaa9f7ce327baf6dd72266
+vendor/lib64/librs_adreno.so
+vendor/lib64/librs_adreno_sha1.so
+vendor/lib64/libRSDriver_adreno.so
+vendor/lib64/libscale.so
 
 # GPU firmware
 etc/firmware/a420_pfp.fw
@@ -412,7 +395,6 @@ bin/imscmservice:vendor/bin/imscmservice
 bin/imsdatadaemon:vendor/bin/imsdatadaemon
 bin/imsqmidaemon:vendor/bin/imsqmidaemon
 -vendor/app/ims/ims.apk
--vendor/app/imssettings/imssettings.apk
 vendor/lib64/lib-dplmedia.so
 vendor/lib64/lib-ims-rcscmjni.so
 vendor/lib64/lib-imsSDP.so
@@ -438,7 +420,6 @@ vendor/lib64/librcc.so
 vendor/lib64/libvoice-svc.so
 
 # Keystore
-vendor/lib/hw/keystore.msm8992.so
 vendor/lib64/hw/keystore.msm8992.so
 
 # Media
@@ -471,7 +452,6 @@ vendor/lib64/libqti-perfd-client.so
 # Peripheral manager
 bin/pm-proxy:vendor/bin/pm-proxy
 bin/pm-service:vendor/bin/pm-service
-vendor/lib/libperipheral_client.so
 vendor/lib64/libperipheral_client.so
 
 # Qseecomm
@@ -486,7 +466,6 @@ vendor/lib64/libssd.so
 # Qualcomm framework
 bin/mmbn-daemon:vendor/bin/mmbn-daemon
 etc/permissions/qti_permissions.xml|2826b33ed8e2756cc748c80bd6c466ff8af97ac5
--lib/libqminvapi.so
 -lib64/libqminvapi.so
 vendor/lib/libdiag.so
 vendor/lib/libdsi_netctrl.so
@@ -526,8 +505,6 @@ vendor/lib64/libxml.so
 # Radio
 -app/QtiTelephonyService/QtiTelephonyService.apk
 -app/datastatusnotification/datastatusnotification.apk
--app/fastdormancy/fastdormancy.apk
--app/shutdownlistener/shutdownlistener.apk
 bin/irsc_util:vendor/bin/irsc_util
 bin/netmgrd:vendor/bin/netmgrd
 bin/qmuxd:vendor/bin/qmuxd
@@ -537,17 +514,13 @@ bin/tftp_server:vendor/bin/tftp_server
 etc/data/dsi_config.xml
 etc/data/netmgr_config.xml
 etc/data/qmi_config.xml
-etc/modem/Diag.cfg
 etc/permissions/qcnvitems.xml
 etc/permissions/qcrilhook.xml
 etc/permissions/qti_telephony_common.xml
-etc/wifibt_diag.cfg
--framework/QtiTelephonyServicelibrary.jar
--framework/qcnvitems.jar
--framework/qcrilhook.jar
--framework/qti-telephony-common.jar|2eba987ae297a892e895ec1e9a302b41dbe0232e
+framework/qcnvitems.jar
+framework/qcrilhook.jar
+framework/qti-telephony-common.jar|2eba987ae297a892e895ec1e9a302b41dbe0232e
 -priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
-lib/librmnetctl.so
 lib64/librmnetctl.so
 vendor/bin/qti
 vendor/lib/libmdmdetect.so
@@ -585,10 +558,8 @@ vendor/lib64/libthermalioctl.so
 # Time services
 -app/TimeService/TimeService.apk
 bin/time_daemon:vendor/bin/time_daemon
-vendor/lib/libTimeService.so
--vendor/lib/libtime_genoff.so
 vendor/lib64/libTimeService.so
--vendor/lib64/libtime_genoff.so
+vendor/lib64/libtime_genoff.so
 
 # Wi-Fi
 bin/cnss-daemon:vendor/bin/cnss-daemon
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 1d12e5cb..90a93810 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -36,7 +36,6 @@ on early-init
     write /sys/block/zram0/comp_algorithm lz4
 
 on init
-
     # Set permissions for persist partition
     mkdir /persist 0771 system system
 
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 1dc3046b..8c9cedfd 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -26,9 +26,6 @@
 /sys/devices/soc.0/leds-qpnp-10/leds(/.*)?			u:object_r:sysfs_leds:s0
 /sys/devices/soc.0/leds-qpnp-31/leds(/.*)?			u:object_r:sysfs_leds:s0
 
-# Location
-/system/vendor/bin/location-mq                      u:object_r:location_exec:s0
-
 # Shell files
 /system/vendor/bin/init\.qcom\.sh					u:object_r:qti_init_shell_exec:s0
 /system/vendor/bin/init\.qcom\.post_boot\.sh		u:object_r:qti_init_shell_exec:s0