init q

Android.mk

@@ -42,16 +42,6 @@ $(MODEM_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 
 ALL_DEFAULT_INSTALLED_MODULES += $(MODEM_SYMLINKS)
 
-IMS_LIBS := libimscamera_jni.so libimsmedia_jni.so
-IMS_SYMLINKS := $(addprefix $(TARGET_OUT_APPS)/ims/lib/arm64/,$(notdir $(IMS_LIBS)))
-$(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "IMS lib link: $@"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf /system/lib64/$(notdir $@) $@
-
-ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS)
-
 WCNSS_INI_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini
 $(WCNSS_INI_SYMLINK): $(LOCAL_INSTALLED_MODULE)
 	@echo "WCNSS config ini link: $@"
@@ -180,6 +170,15 @@ $(AUTHHAT_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 
 ALL_DEFAULT_INSTALLED_MODULES += $(AUTHHAT_SYMLINKS)
 
+AUTHHAT_SYMLINKS1 := $(addprefix $(TARGET_OUT_VENDOR)/firmware_mnt/image/,$(notdir $(AUTHHAT_IMAGES)))
+$(AUTHHAT_SYMLINKS1): $(LOCAL_INSTALLED_MODULE)
+	@echo "AUTHHAT firmware link: $@"
+	@mkdir -p $(dir $@)
+	@rm -rf $@
+	$(hide) ln -sf /firmware/image/$(notdir $@) $@
+
+ALL_DEFAULT_INSTALLED_MODULES += $(AUTHHAT_SYMLINKS1)
+
 BDWLAN_IMAGES := \
     bdwlan30.b01 bdwlan30.b02 bdwlan30.b03 bdwlan30.b04 bdwlan30.b05 bdwlan30.b06 bdwlan30.b07 \
     bdwlan30.b08 bdwlan30.b09 bdwlan30.b0a bdwlan30.b0b bdwlan30.b0c bdwlan30.b0d bdwlan30.b0e \
@@ -194,6 +193,15 @@ $(BDWLAN_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 
 ALL_DEFAULT_INSTALLED_MODULES += $(BDWLAN_SYMLINKS)
 
+BDWLAN_SYMLINKS1 := $(addprefix $(TARGET_OUT_VENDOR)/firmware_mnt/image/,$(notdir $(BDWLAN_IMAGES)))
+$(BDWLAN_SYMLINKS1): $(LOCAL_INSTALLED_MODULE)
+	@echo "BDWLAN firmware link: $@"
+	@mkdir -p $(dir $@)
+	@rm -rf $@
+	$(hide) ln -sf /firmware/image/$(notdir $@) $@
+
+ALL_DEFAULT_INSTALLED_MODULES += $(BDWLAN_SYMLINKS1)
+
 CPE_IMAGES := \
     cpe_9335.b08 cpe_9335.b09 cpe_9335.b11 cpe_9335.b14 cpe_9335.b16 \
     cpe_9335.b18 cpe_9335.b19 cpe_9335.b20 cpe_9335.b22 cpe_9335.b24 \
@@ -265,6 +273,15 @@ $(ADD_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 
 ALL_DEFAULT_INSTALLED_MODULES += $(ADD_SYMLINKS)
 
+ADD_SYMLINKS1 := $(addprefix $(TARGET_OUT_VENDOR)/firmware_mnt/image/,$(notdir $(ADD_IMAGES)))
+$(ADD_SYMLINKS1): $(LOCAL_INSTALLED_MODULE)
+	@echo "Additional firmware link: $@"
+	@mkdir -p $(dir $@)
+	@rm -rf $@
+	$(hide) ln -sf /firmware/image/$(notdir $@) $@
+
+ALL_DEFAULT_INSTALLED_MODULES += $(ADD_SYMLINKS1)
+
 FINGERPR_IMAGES := fingerpr.b00 fingerpr.b01 fingerpr.b02 fingerpr.b03 fingerpr.b04 fingerpr.b05 fingerpr.b06 fingerpr.mdt
 
 FINGERPR_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(notdir $(FINGERPR_IMAGES)))
@@ -276,6 +293,15 @@ $(FINGERPR_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 
 ALL_DEFAULT_INSTALLED_MODULES += $(FINGERPR_SYMLINKS)
 
+FINGERPR_SYMLINKS1 := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(notdir $(FINGERPR_IMAGES)))
+$(FINGERPR_SYMLINKS1): $(LOCAL_INSTALLED_MODULE)
+	@echo "FINGERPR firmware link: $@"
+	@mkdir -p $(dir $@)
+	@rm -rf $@
+	$(hide) ln -sf /firmware/image/$(notdir $@) $@
+
+ALL_DEFAULT_INSTALLED_MODULES += $(FINGERPR_SYMLINKS1)
+
 GPSTEST_IMAGES := gptest.b00 gptest.b01 gptest.b02 gptest.b03 gptest.b04 gptest.b05 gptest.b06 gptest.mdt
 
 GPSTEST_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(notdir $(GPSTEST_IMAGES)))

AndroidProducts.mk

@@ -15,3 +15,6 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/lineage_gts3llte.mk
+
+COMMON_LUNCH_CHOICES := \
+    lineage_gts3llte-userdebug

BoardConfig.mk

@@ -15,6 +15,9 @@
 # limitations under the License.
 #
 
+# temporary
+BUILD_BROKEN_DUP_RULES := true
+
 BOARD_VENDOR := samsung
 
 DEVICE_PATH := device/samsung/gts3llte
@@ -49,6 +52,7 @@ TARGET_NO_BOOTLOADER := true
 # Kernel
 BOARD_KERNEL_BASE := 0x80000000
 BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7464900.sdhci lpm_levels.sleep_disabled=1 rcupdate.rcu_expedited=1 cma=32M@0-0xffffffff
+BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 BOARD_KERNEL_IMAGE_NAME := Image.gz
 BOARD_KERNEL_PAGESIZE := 4096
 BOARD_KERNEL_SEPARATED_DT := true
@@ -56,19 +60,15 @@ BOARD_MKBOOTIMG_ARGS := --kernel_offset 0x00008000 --ramdisk_offset 0x02200000 -
 TARGET_KERNEL_SOURCE := kernel/samsung/msm8996
 BOARD_CUSTOM_BOOTIMG := true
 BOARD_CUSTOM_BOOTIMG_MK := hardware/samsung/mkbootimg.mk
-TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android-
+#TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android-
 TARGET_KERNEL_CONFIG := lineage_gts3llte_defconfig
 
 TARGET_COMPILE_WITH_MSM_KERNEL := true
-#SELINUX_IGNORE_NEVERALLOWS := true
 
 # Platform
 TARGET_BOARD_PLATFORM := msm8996
 TARGET_BOARD_PLATFORM_GPU := qcom-adreno530
 
-# Properties
-#BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
-
 # ANT+
 BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
 
@@ -95,27 +95,20 @@ AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true
 #AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := true
 AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true
 #BOARD_SUPPORTS_SOUND_TRIGGER := true
-#BOARD_USES_ALSA_AUDIO := true
+BOARD_USES_ALSA_AUDIO := true
 #USE_CUSTOM_AUDIO_POLICY := 1
 
+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
-BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_QCOM := true
 QCOM_BT_USE_BTNV := true
-BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED := false
-
-# CAF HALs
-TARGET_QCOM_MEDIA_VARIANT := caf-msm8996
-TARGET_QCOM_DISPLAY_VARIANT := caf-msm8996
-
-PRODUCT_SOONG_NAMESPACES += \
-    hardware/qcom/display-$(TARGET_QCOM_DISPLAY_VARIANT) \
-    hardware/qcom/media-$(TARGET_QCOM_MEDIA_VARIANT)
 
 # Camera
 USE_CAMERA_STUB := true
@@ -165,6 +158,9 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(DEVICE_PATH)/configs/vendor_fram
 DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/manifest.xml
 DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/compatibility_matrix.xml
 
+# LineageHW
+BOARD_HARDWARE_CLASS += hardware/lineage/lineagehw
+
 # Lineage Hardware
 JAVA_SOURCE_OVERLAYS := org.lineageos.hardware|$(DEVICE_PATH)/lineagehw|**/*.java
 
@@ -183,13 +179,6 @@ TARGET_USES_MKE2FS := true
 # Fingerprint
 TARGET_SEC_FP_HAL_VARIANT := bauth
 
-TARGET_LD_SHIM_LIBS := \
-	/system/vendor/lib/libbauthserver.so|/vendor/lib/libbauthtzcommon_shim.so \
-	/system/vendor/lib64/libbauthserver.so|/vendor/lib64/libbauthtzcommon_shim.so
-
-TARGET_LD_SHIM_LIBS += \
-   /system/vendor/lib/hw/camera.msm8996.so|/system/vendor/lib/libshims_cameraclient.so
-
 # Init
 TARGET_PLATFORM_DEVICE_BASE := /devices/soc/
 
@@ -202,13 +191,11 @@ TARGET_USES_INTERACTION_BOOST := true
 
 # QCOM
 BOARD_USES_QCOM_HARDWARE := true
-#TARGET_USE_SDCLANG := true
 
 # Ramdisk
-BOARD_ROOT_EXTRA_FOLDERS := dsp efs firmware firmware-modem persist
+BOARD_ROOT_EXTRA_FOLDERS := efs firmware firmware-modem persist
 BOARD_ROOT_EXTRA_SYMLINKS := /system/etc/firmware/btfw32.tlv:/bt_firmware/image/btfw32.tlv
 BOARD_ROOT_EXTRA_SYMLINKS += /system/etc/firmware/btnv32.bin:/bt_firmware/image/btnv32.bin
-BOARD_ROOT_EXTRA_SYMLINKS += /data/tombstones:/tombstones
 
 # Recovery
 TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
@@ -219,18 +206,23 @@ TARGET_USERIMAGES_USE_F2FS := true
 #PRODUCT_FULL_TREBLE_OVERRIDE := true
 #PRODUCT_VENDOR_MOVE_ENABLED := true
 
+# Properties
+#BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
+
 # RIL
 PROTOBUF_SUPPORTED := true
 TARGET_RIL_VARIANT := caf
 
-# Security patch level - T825XXU2BRL2
+# Security patch level - T825XXU3CSH7
-VENDOR_SECURITY_PATCH := 2018-12-01
+VENDOR_SECURITY_PATCH := 2019-08-01
 
 SELINUX_IGNORE_NEVERALLOWS := true
 
 # SELinux
-include device/qcom/sepolicy/sepolicy.mk
+#include device/qcom/sepolicy/sepolicy.mk
-BOARD_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy
+#BOARD_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy
+
+include $(DEVICE_PATH)/sepolicy_tmp/sepolicy.mk
 
 # Wifi
 BOARD_HAS_QCOM_WLAN := true

README.md

@@ -19,8 +19,8 @@ Copyright (C) 2018 Valera Chigir <valera1978@tut.by>
 
   - Make a workspace
 
-mkdir cm16
+mkdir cm17
-cd cm16
+cd cm17
 
   - Do repo init & sync
 

bluetooth/bdroid_buildcfg.h

@@ -24,6 +24,12 @@
 
 #define BTM_DEF_LOCAL_NAME   "Samsung Galaxy Tab S3"
 #define BLUETOOTH_QTI_SW TRUE
+#define MAX_ACL_CONNECTIONS   16
+#define MAX_L2CAP_CHANNELS    16
 #define BLE_VND_INCLUDED   TRUE
+#define BT_CLEAN_TURN_ON_DISABLED 1
+
+/* Increasing SEPs to 12 from 6 to support SHO/MCast i.e. two streams per codec */
+#define AVDT_NUM_SEPS 12
 
 #endif

config.fs

@@ -52,36 +52,6 @@ user: AID_SYSTEM
 group: AID_SYSTEM
 caps: NET_BIND_SERVICE
 
-[vendor/bin/imsdatadaemon]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: NET_BIND_SERVICE
-
-[vendor/bin/ims_rtp_daemon]
-mode: 0755
-user: AID_SYSTEM
-group: AID_RADIO
-caps: NET_BIND_SERVICE
-
-[system/vendor/bin/ims_rtp_daemon]
-mode: 0755
-user: AID_SYSTEM
-group: AID_RADIO
-caps: NET_BIND_SERVICE
-
-[vendor/bin/imsrcsd]
-mode: 0755
-user: AID_SYSTEM
-group: AID_RADIO
-caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM
-
-[vendor/bin/cnd]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: NET_BIND_SERVICE BLOCK_SUSPEND NET_ADMIN
-
 [vendor/bin/slim_daemon]
 mode: 0755
 user:  AID_GPS
@@ -106,6 +76,12 @@ user: AID_SYSTEM
 group: AID_SYSTEM
 caps: 0
 
+[firmware-modem/]
+mode: 0771
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: 0
+
 [bt_firmware/]
 mode: 0771
 user: AID_SYSTEM
@@ -117,9 +93,3 @@ mode: 0771
 user: AID_SYSTEM
 group: AID_SYSTEM
 caps: 0
-
-[dsp/]
-mode: 0771
-user: AID_MEDIA
-group: AID_MEDIA
-caps: 0

configs/audio/audio_policy_configuration.xml

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
+
+    <!-- Global configuration Decalaration -->
+    <globalConfiguration speaker_drc_enabled="false"/>
+
+
+    <!-- Modules section:
+        There is one section per audio HW module present on the platform.
+        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.
+        The module names are the same as in current .conf file:
+                “primary”, “A2DP”, “remote_submix”, “USB”
+        Each module will contain the following sections:
+        “devicePorts”: a list of device descriptors for all input and output devices accessible via this
+        module.
+        This contains both permanently attached devices and removable devices.
+        “mixPorts”: listing all output and input streams exposed by the audio HAL
+        “routes”: list of possible connections between input and output devices or between stream and
+        devices.
+            "route": is defined by an attribute:
+                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)
+                -"sink": the sink involved in this route
+                -"sources": all the sources than can be connected to the sink via vis route
+        “attachedDevices”: permanently attached devices.
+        The attachedDevices section is a list of devices names. The names correspond to device names
+        defined in <devicePorts> section.
+        “defaultOutputDevice”: device to be used by default when no policy rule applies
+    -->
+    <modules>
+        <!-- Primary Audio HAL -->
+        <module name="primary" halVersion="2.0">
+            <attachedDevices>
+                <item>Speaker</item>
+                <item>Built-In Mic</item>
+            </attachedDevices>
+            <defaultOutputDevice>Speaker</defaultOutputDevice>
+            <mixPorts>
+                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="deep_buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="primary input" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+                </mixPort>
+            </mixPorts>
+            <devicePorts>
+                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
+                <devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </devicePort>
+            </devicePorts>
+            <!-- route declaration, i.e. list all available sources for a given sink -->
+            <routes>
+                <route type="mix" sink="Speaker"
+                       sources="primary output,deep_buffer"/>
+                <route type="mix" sink="Wired Headset"
+                       sources="primary output,deep_buffer"/>
+                <route type="mix" sink="Wired Headphones"
+                       sources="primary output,deep_buffer"/>
+                <route type="mix" sink="primary input"
+                       sources="Built-In Mic,Wired Headset Mic"/>
+            </routes>
+
+        </module>
+
+        <!-- A2dp Audio HAL -->
+        <xi:include href="/vendor/etc/a2dp_audio_policy_configuration.xml"/>
+
+        <!-- Usb Audio HAL -->
+        <xi:include href="/vendor/etc/usb_audio_policy_configuration.xml"/>
+
+        <!-- Remote Submix Audio HAL -->
+        <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>
+
+    </modules>
+    <!-- End of Modules section -->
+
+    <!-- Volume section -->
+
+    <xi:include href="/vendor/etc/audio_policy_volumes.xml"/>
+    <xi:include href="/vendor/etc/default_volume_tables.xml"/>
+
+    <!-- End of Volume section -->
+
+</audioPolicyConfiguration>

configs/manifest.xml

@@ -46,8 +46,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     </hal>
     <hal format="hidl">
         <name>android.hardware.audio</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>5.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
@@ -55,8 +55,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     </hal>
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>5.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
@@ -64,7 +64,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
-        <transport>hwbinder</transport>
+        <transport arch="32+64">passthrough</transport>
         <version>1.0</version>
         <interface>
             <name>IBluetoothHci</name>
@@ -80,15 +80,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>legacy/0</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.cas</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IMediaCasService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.configstore</name>
         <transport>hwbinder</transport>
@@ -100,7 +91,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     </hal>
     <hal format="hidl">
         <name>android.hardware.drm</name>
-        <transport>hwbinder</transport>
+        <transport arch="32+64">passthrough</transport>
         <version>1.0</version>
         <interface>
             <name>ICryptoFactory</name>
@@ -110,8 +101,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <name>IDrmFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.1::ICryptoFactory/clearkey</fqname>
+        <fqname>@1.2::ICryptoFactory/clearkey</fqname>
-        <fqname>@1.1::IDrmFactory/clearkey</fqname>
+        <fqname>@1.2::IDrmFactory/clearkey</fqname>
         <fqname>@1.1::ICryptoFactory/widevine</fqname>
         <fqname>@1.1::IDrmFactory/widevine</fqname>
     </hal>
@@ -213,8 +204,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     </hal>
     <hal format="hidl">
         <name>android.hardware.power</name>
-        <transport>hwbinder</transport>
+        <transport arch="32+64">passthrough</transport>
-        <version>1.1</version>
+        <version>1.2</version>
         <interface>
             <name>IPower</name>
             <instance>default</instance>
@@ -227,12 +218,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <interface>
             <name>IRadio</name>
             <instance>slot1</instance>
-            <instance>slot2</instance>
         </interface>
         <interface>
             <name>ISap</name>
             <instance>slot1</instance>
-            <instance>slot2</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -242,7 +231,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <interface>
             <name>IOemHook</name>
             <instance>slot1</instance>
-            <instance>slot2</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -263,6 +251,15 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
         </interface>
     </hal>
+<!--    <hal format="hidl">
+        <name>android.frameworks.sensorservice</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ISensorManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal> -->
     <hal format="hidl">
         <name>android.hardware.soundtrigger</name>
         <transport arch="32">passthrough</transport>
@@ -293,12 +290,21 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <hal format="hidl">
         <name>android.hardware.usb</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>IUsb</name>
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.usb.gadget</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IUsbGadget</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.vibrator</name>
         <transport>hwbinder</transport>
@@ -311,16 +317,25 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <hal format="hidl">
         <name>android.hardware.wifi</name>
         <transport>hwbinder</transport>
-        <version>1.2</version>
+        <version>1.3</version>
         <interface>
             <name>IWifi</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.wifi.supplicant</name>
+        <name>android.hardware.wifi.hostapd</name>
         <transport>hwbinder</transport>
         <version>1.1</version>
+        <interface>
+            <name>IHostapd</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.wifi.supplicant</name>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
         <interface>
             <name>ISupplicant</name>
             <instance>default</instance>
@@ -344,15 +359,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>dpmQmiService</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>com.qualcomm.qti.imscmservice</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IImsCmService</name>
-            <instance>qti.ims.connectionmanagerservice</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>com.qualcomm.qti.uceservice</name>
         <transport>hwbinder</transport>
@@ -362,24 +368,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>com.qualcomm.qti.uceservice</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>com.quicinc.cne.api</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IApiService</name>
-            <instance>cnd</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>com.quicinc.cne.server</name>
-        <transport>hwbinder</transport>
-        <version>2.2</version>
-        <interface>
-            <name>IServer</name>
-            <instance>cnd</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>vendor.display.color</name>
         <transport>hwbinder</transport>
@@ -411,6 +399,26 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <name>vendor.lineage.livedisplay</name>
         <transport arch="32+64">passthrough</transport>
         <version>2.0</version>
+        <interface>
+            <name>IAdaptiveBacklight</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IAutoContrast</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IColorBalance</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IColorEnhancement</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IDisplayColorCalibration</name>
+            <instance>default</instance>
+        </interface>
         <interface>
             <name>IDisplayModes</name>
             <instance>default</instance>
@@ -419,13 +427,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <name>IPictureAdjustment</name>
             <instance>default</instance>
         </interface>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.lineage.power</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
         <interface>
-            <name>ILineagePower</name>
+            <name>IReadingEnhancement</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>ISunlightEnhancement</name>
             <instance>default</instance>
         </interface>
     </hal>
@@ -438,6 +445,27 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.lineage.touch</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IGloveMode</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IKeyDisabler</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IStylusMode</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>ITouchscreenGesture</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.gnss</name>
         <transport>hwbinder</transport>
@@ -591,13 +619,4 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>uimRemoteServer1</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.qti.imsrtpservice</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IRTPService</name>
-            <instance>imsrtpservice</instance>
-        </interface>
-    </hal>
 </manifest>

configs/privapp-permissions-qti.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* 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.
+ */
+-->
+
+<!--
+This XML file declares which signature|privileged permissions should be
+granted to privileged applications on Qualcomm devices.
+It allows additional grants on top of privapp-permissions-platform.xml
+-->
+
+<permissions>
+    <privapp-permissions package="com.qti.dpmserviceapp">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.qualcomm.wfd.service">
+        <permission name="android.permission.READ_FRAME_BUFFER"/>
+        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="org.codeaurora.ims">
+        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="org.simalliance.openmobileapi.service">
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+</permissions>

configs/public.libraries.txt

@@ -0,0 +1,3 @@
+libadsprpc.so
+libOpenCL.so
+libqti-perfd-client.so

configs/qti_whitelist.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<!--
+/* 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.
+ */
+-->
+
+<config>
+    <!-- These are telephony components that need to freely run in the background -->
+    <allow-in-power-save package="com.qualcomm.atfwd" />
+    <allow-in-power-save package="com.qualcomm.qti.telephonyservice" />
+    <allow-in-power-save package="com.qualcomm.qcrilmsgtunnel" />
+    <allow-in-power-save package="com.qualcomm.qti.ims" />
+    <allow-in-power-save package="com.qualcomm.qti.radioconfiginterface" />
+    <allow-in-power-save package="com.qualcomm.simcontacts" />
+    <allow-in-power-save package="com.qualcomm.qti.autoregistration" />
+    <allow-in-power-save package="com.qualcomm.qti.server.wigigapp" />
+    <allow-in-power-save package="com.qualcomm.qti.StatsPollManager" />
+    <allow-in-power-save package="com.qualcomm.qti.gsma.services.nfc" />
+
+    <!-- These telephony applications need access to non-[System]SDK APIs -->
+    <hidden-api-whitelisted-app package="com.qualcomm.uimremoteserver" />
+    <hidden-api-whitelisted-app package="com.qualcomm.uimremoteclient" />
+    <hidden-api-whitelisted-app package="com.qualcomm.atfwd" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.autoregistration" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.callenhancement" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.callfeaturessetting" />
+    <hidden-api-whitelisted-app package="com.qti.qualcomm.datastatusnotification" />
+    <hidden-api-whitelisted-app package="com.qti.qualcomm.deviceinfo" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.modemtestmode" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.networksetting" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.qtisystemservice" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.telephonyservice" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.radioconfiginterface" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.roamingsettings" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.simsettings" />
+    <hidden-api-whitelisted-app package="org.codeaurora.ims" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.ims" />
+    <hidden-api-whitelisted-app package="com.qti.xdivert" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qcrilmsgtunnel" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.ltedirect" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.app" />
+    <hidden-api-whitelisted-app package="com.qualcomm.embms" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.embmstuneaway" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.lpa" />
+    <hidden-api-whitelisted-app package="com.qualcomm.qti.uim" />
+
+    <hidden-api-whitelisted-app package="com.qualcomm.wfd.client" />
+    <hidden-api-whitelisted-app package="com.qualcomm.wfd.service" />
+</config>

configs/vendor_framework_compatibility_matrix.xml

@@ -203,7 +203,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </interface>
     </hal>
     <hal format="hidl" optional="true">
-        <name>vendor.qti.imsrtpservice</name>
+        <name>
+vendor.qti.imsrtpservice</name>
         <version>1.0</version>
         <interface>
             <name>IRTPService</name>

device.mk

@@ -25,7 +25,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
 # Screen density
 PRODUCT_AAPT_CONFIG := normal
-PRODUCT_AAPT_PREF_CONFIG := xxxhdpi
+PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 2048
@@ -37,22 +37,23 @@ PRODUCT_CHARACTERISTICS := tablet
 
 # Dalvik
 PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.heapstartsize=16m \
+    dalvik.vm.heapstartsize=8m \
     dalvik.vm.heapgrowthlimit=256m \
     dalvik.vm.heapsize=512m \
     dalvik.vm.heaptargetutilization=0.75 \
-    dalvik.vm.heapminfree=4m \
+    dalvik.vm.heapminfree=512k \
-    dalvik.vm.heapmaxfree=16m
+    dalvik.vm.heapmaxfree=8m
 
 # Permissions
 PRODUCT_COPY_FILES += \
+    external/ant-wireless/antradio-library/com.dsi.ant.antradio_library.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.dsi.ant.antradio_library.xml \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \
-    frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml \
     frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \
     frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \
     frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
+    frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
     frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
     frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
@@ -60,10 +61,12 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \
     frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \
     frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml \
+    frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \
     frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \
     frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml \
     frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml \
     frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.gsm.xml \
+    frameworks/native/data/etc/android.hardware.telephony.ims.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.ims.xml \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
     frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \
     frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \
@@ -72,6 +75,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
     frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
     frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \
+    frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml \
     frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml \
     frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml \
     frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml \
@@ -82,6 +86,15 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/data/netmgr_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/netmgr_config.xml \
     $(LOCAL_PATH)/configs/data/qmi_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/data/qmi_config.xml
 
+# QCOM
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
+    $(LOCAL_PATH)/configs/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml
+
+# Additional native libraries
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt
+
 # ANT+
 PRODUCT_PACKAGES += \
     AntHalService \
@@ -91,8 +104,15 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.audio@2.0-impl \
     android.hardware.audio@2.0-service \
+    android.hardware.audio@5.0 \
+    android.hardware.audio@5.0-impl \
+    android.hardware.audio.common@5.0 \
+    android.hardware.audio.common@5.0-util \
     android.hardware.audio.effect@2.0-impl \
+    android.hardware.audio.effect@5.0 \
+    android.hardware.audio.effect@5.0-impl \
     audio.a2dp.default \
+    audio.primary.msm8996 \
     audio.r_submix.default \
     audio.usb.default \
     libaudio-resampler \
@@ -103,16 +123,21 @@ PRODUCT_PACKAGES += \
     libvolumelistener \
     tinymix
 
-#    audio.primary.msm8996 \
+PRODUCT_COPY_FILES += \
-#    android.hardware.soundtrigger@2.0-impl \
+    $(LOCAL_PATH)/configs/audio/audio_effects.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/audio_effects.conf \
+    $(LOCAL_PATH)/configs/audio/listen_platform_info.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/listen_platform_info.xml \
+    $(LOCAL_PATH)/configs/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \
+    $(LOCAL_PATH)/configs/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
+    $(LOCAL_PATH)/configs/audio/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
+    $(LOCAL_PATH)/configs/audio/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml
 
-#PRODUCT_COPY_FILES += \
+PRODUCT_COPY_FILES += \
-#	$(LOCAL_PATH)/configs/audio/audio_effects.conf:system/etc/audio_effects.conf \
+    $(LOCAL_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
-#	$(LOCAL_PATH)/configs/audio/listen_platform_info.xml:system/etc/listen_platform_info.xml \
+    frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
-#	$(LOCAL_PATH)/configs/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \
+    frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
-#	$(LOCAL_PATH)/configs/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \
+    frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
-#	$(LOCAL_PATH)/configs/audio/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
+    frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
-#	$(LOCAL_PATH)/configs/audio/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml
+    frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
 
 # Camera
 PRODUCT_PACKAGES += \
@@ -120,9 +145,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.camera.device@1.0 \
     vendor.qti.hardware.camera.device@1.0_vendor
 
-PRODUCT_PACKAGES += \
-    libshims_cameraclient
-
 PRODUCT_PACKAGES += \
     Snap
 
@@ -165,12 +187,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \
     android.hardware.drm@1.0-service \
-    android.hardware.drm@1.1-service.clearkey
+    android.hardware.drm@1.2-service.clearkey
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service \
+    android.hardware.biometrics.fingerprint@2.1-service
-    libbauthtzcommon_shim
 
 # For config.fs
 PRODUCT_PACKAGES += \
@@ -200,19 +221,21 @@ PRODUCT_COPY_FILES += \
 # Healthd
 PRODUCT_PACKAGES += \
     android.hardware.health@2.0-impl \
-    android.hardware.health@2.0-service \
+    android.hardware.health@2.0-service
-    charger_res_images
 
 # HIDL
 PRODUCT_PACKAGES += \
     android.hidl.base@1.0 \
-    android.hidl.base@1.0_system \
+    android.hidl.manager@1.0
-    android.hidl.manager@1.0 \
-    android.hidl.manager@1.0_system
 
-# IMS
+# Telephony
 PRODUCT_PACKAGES += \
-    ims-ext-common
+    ims-ext-common \
+    telephony-ext
+
+PRODUCT_BOOT_JARS += \
+    ims-ext-common \
+    telephony-ext
 
 # IPA Manager
 PRODUCT_PACKAGES += \
@@ -292,7 +315,7 @@ PRODUCT_PACKAGES += \
 
 # Power
 PRODUCT_PACKAGES += \
-    android.hardware.power@1.1-service-qti
+    android.hardware.power@1.2-service-qti
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
@@ -315,8 +338,7 @@ PRODUCT_PACKAGES += \
     init.qcom.power.rc \
     init.qcom.usb.rc \
     init.samsung.rc \
-    ueventd.qcom.rc \
+    ueventd.qcom.rc
-    init.qcom.sh
 
 # RenderScript
 PRODUCT_PACKAGES += \
@@ -343,19 +365,12 @@ PRODUCT_PACKAGES += \
 # Sensors
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf \
-    $(LOCAL_PATH)/configs/sensors/sensor_def_qcomdev.conf:system/etc/sensors/sensor_def_qcomdev.conf	
+    $(LOCAL_PATH)/configs/sensors/sensor_def_qcomdev.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/sensors/sensor_def_qcomdev.conf	
 	
 # Thermal engine
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/thermal-engine-8996.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-8996.conf
 
-# Telephony
-PRODUCT_PACKAGES += \
-    telephony-ext
-
-PRODUCT_BOOT_JARS += \
-    telephony-ext
-
 # TextClassifier
 PRODUCT_PACKAGES += \
     textclassifier.bundle1

doze/Android.mk

@@ -1,8 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := optional
-
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := SamsungDoze
@@ -13,12 +11,8 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_USE_AAPT2 := true
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-v4 \
+    androidx.core_core \
-    android-support-v13 \
+    androidx.preference_preference
-    android-support-v7-recyclerview \
-    android-support-v7-preference \
-    android-support-v7-appcompat \
-    android-support-v14-preference
 
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/res \
@@ -27,5 +21,3 @@ LOCAL_RESOURCE_DIR := \
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))

doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java

@@ -27,11 +27,6 @@ import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -39,6 +34,11 @@ import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.TextView;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.SwitchPreference;
 
 public class DozeSettingsFragment extends PreferenceFragment implements OnPreferenceChangeListener,
         CompoundButton.OnCheckedChangeListener {

doze/src/org/lineageos/settings/doze/Utils.java

@@ -21,11 +21,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
-import android.support.v7.preference.PreferenceManager;
 import android.provider.Settings;
 import android.util.Log;
-
+import androidx.preference.PreferenceManager;
-import com.android.internal.hardware.AmbientDisplayConfiguration;
 
 import static android.provider.Settings.Secure.DOZE_ALWAYS_ON;
 import static android.provider.Settings.Secure.DOZE_ENABLED;
@@ -108,7 +106,7 @@ public final class Utils {
     }
 
     protected static boolean alwaysOnDisplayAvailable(Context context) {
-        return new AmbientDisplayConfiguration(context).alwaysOnAvailable();
+        return true;
     }
 
     protected static boolean isGestureEnabled(Context context, String gesture) {

gps/core/Android.mk

@@ -4,7 +4,6 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_core
 LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
 
 ifeq ($(BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET),true)
 LOCAL_CFLAGS += -DPDK_FEATURE_SET

gps/gnss/Android.mk

@@ -4,7 +4,6 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libgnss
 LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \

gps/gnsspps/Android.mk

@@ -5,7 +5,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libgnsspps
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \

gps/location/Android.mk

@@ -4,7 +4,6 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := liblocation_api
 LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \

gps/utils/Android.mk

@@ -42,7 +42,6 @@ LOCAL_HEADER_LIBRARIES := \
 
 LOCAL_MODULE := libgps.utils
 LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
 
 LOCAL_PRELINK_MODULE := false
 

gps/utils/MsgTask.cpp

@@ -83,7 +83,7 @@ void MsgTask::sendMsg(const LocMsg* msg) const {
 
 void MsgTask::prerun() {
     // make sure we do not run in background scheduling group
-     set_sched_policy(gettid(), SP_FOREGROUND);
+//     set_sched_policy(gettid(), SP_FOREGROUND);
 }
 
 bool MsgTask::run() {

include/hardware/audio_amplifier.h

@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2015, The CyanogenMod 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.
+ */
+
+#ifndef CM_AUDIO_AMPLIFIER_INTERFACE_H
+#define CM_AUDIO_AMPLIFIER_INTERFACE_H
+
+#include <stdint.h>
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+#include <hardware/audio.h>
+#include <hardware/hardware.h>
+
+#include <system/audio.h>
+
+__BEGIN_DECLS
+
+#define AMPLIFIER_HARDWARE_MODULE_ID "audio_amplifier"
+
+#define AMPLIFIER_HARDWARE_INTERFACE "audio_amplifier_hw_if"
+
+#define AMPLIFIER_MODULE_API_VERSION_0_1 HARDWARE_MODULE_API_VERSION(0, 1)
+
+#define AMPLIFIER_DEVICE_API_VERSION_1_0 HARDWARE_DEVICE_API_VERSION(1, 0)
+#define AMPLIFIER_DEVICE_API_VERSION_2_0 HARDWARE_DEVICE_API_VERSION(2, 0)
+#define AMPLIFIER_DEVICE_API_VERSION_2_1 HARDWARE_DEVICE_API_VERSION(2, 1)
+#define AMPLIFIER_DEVICE_API_VERSION_CURRENT AMPLIFIER_DEVICE_API_VERSION_2_1
+
+struct str_parms;
+
+typedef struct amplifier_device {
+    /**
+     * Common methods of the amplifier device. This *must* be the first member
+     * of amplifier_device as users of this structure will cast a hw_device_t
+     * to amplifier_device pointer in contexts where it's known
+     * the hw_device_t references a amplifier_device.
+     */
+    struct hw_device_t common;
+
+    /**
+     * Notify amplifier device of current input devices
+     *
+     * This function should handle only input devices.
+     */
+    int (*set_input_devices)(struct amplifier_device *device, uint32_t devices);
+
+    /**
+     * Notify amplifier device of current output devices
+     *
+     * This function should handle only output devices.
+     */
+    int (*set_output_devices)(struct amplifier_device *device, uint32_t devices);
+
+    /**
+     * Notify amplifier device of output device enable/disable
+     *
+     * This function should handle only output devices.
+     */
+    int (*enable_output_devices)(struct amplifier_device *device,
+            uint32_t devices, bool enable);
+
+    /**
+     * Notify amplifier device of input device enable/disable
+     *
+     * This function should handle only input devices.
+     */
+    int (*enable_input_devices)(struct amplifier_device *device,
+            uint32_t devices, bool enable);
+
+    /**
+     * Notify amplifier device about current audio mode
+     */
+    int (*set_mode)(struct amplifier_device *device, audio_mode_t mode);
+
+    /**
+     * Notify amplifier device that an output stream has started
+     */
+    int (*output_stream_start)(struct amplifier_device *device,
+            struct audio_stream_out *stream, bool offload);
+
+    /**
+     * Notify amplifier device that an input stream has started
+     */
+    int (*input_stream_start)(struct amplifier_device *device,
+            struct audio_stream_in *stream);
+
+    /**
+     * Notify amplifier device that an output stream has stopped
+     */
+    int (*output_stream_standby)(struct amplifier_device *device,
+            struct audio_stream_out *stream);
+
+    /**
+     * Notify amplifier device that an input stream has stopped
+     */
+    int (*input_stream_standby)(struct amplifier_device *device,
+            struct audio_stream_in *stream);
+
+    /**
+     * set/get audio device parameters.
+     */
+    int (*set_parameters)(struct amplifier_device *device,
+        struct str_parms *parms);
+
+    /**
+     * set/get output stream parameters.
+     */
+    int (*out_set_parameters)(struct amplifier_device *device,
+        struct str_parms *parms);
+
+    /**
+     * set/get input stream parameters.
+     */
+    int (*in_set_parameters)(struct amplifier_device *device,
+        struct str_parms *parms);
+} amplifier_device_t;
+
+typedef struct amplifier_module {
+    /**
+     * Common methods of the amplifier module. This *must* be the first member
+     * of amplifier_module as users of this structure will cast a hw_module_t
+     * to amplifier_module pointer in contexts where it's known
+     * the hw_module_t references a amplifier_module.
+     */
+    struct hw_module_t common;
+} amplifier_module_t;
+
+/** convenience API for opening and closing a supported device */
+
+static inline int amplifier_device_open(const struct hw_module_t *module,
+        struct amplifier_device **device)
+{
+    return module->methods->open(module, AMPLIFIER_HARDWARE_INTERFACE,
+            (struct hw_device_t **) device);
+}
+
+static inline int amplifier_device_close(struct amplifier_device *device)
+{
+    return device->common.close(&device->common);
+}
+
+__END_DECLS
+
+#endif  // CM_AUDIO_AMPLIFIER_INTERFACE_H

libhidl/Android.mk

@@ -16,7 +16,6 @@
 include $(CLEAR_VARS)
 LOCAL_SHARED_LIBRARIES := libhidltransport
 LOCAL_MODULE := android.hidl.base@1.0
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_VENDOR_MODULE := true
 include $(BUILD_SHARED_LIBRARY)
@@ -24,7 +23,6 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_SHARED_LIBRARIES := libhidltransport
 LOCAL_MODULE := android.hidl.manager@1.0
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_VENDOR_MODULE := true
 include $(BUILD_SHARED_LIBRARY)

lineage_gts3llte.mk

@@ -20,9 +20,9 @@ PRODUCT_GMS_CLIENTID_BASE := android-samsung
 PRODUCT_BUILD_PROP_OVERRIDES += \
     TARGET_DEVICE="gts3llte" \
     PRODUCT_NAME="gts3llte" \
-    PRIVATE_BUILD_DESC="gts3lltexx-user 8.0.0 R16NW T825XXU2BRL2 release-keys"
+    PRIVATE_BUILD_DESC="gts3lltexx-user 9 PPR1.180610.011 T825XXU3CSH7 release-keys"
 
 # Set BUILD_FINGERPRINT variable to be picked up by both system and vendor build.prop
-BUILD_FINGERPRINT := "samsung/gts3lltexx/gts3llte:8.0.0/R16NW/T825XXU2BRL2:user/release-keys"
+BUILD_FINGERPRINT := "samsung/gts3lltexx/gts3llte:9/PPR1.180610.011/T825XXU3CSH7:user/release-keys"
 
 TARGET_VENDOR := Samsung

overlay/frameworks/base/core/res/res/values/config.xml

@@ -290,11 +290,15 @@
     <!-- 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/framework.jar"</item>
         <item>"/system/framework/oat/arm64/services.odex"</item>
+        <item>"/system/framework/services.jar"</item>
         <item>"/system/framework/arm64/boot.oat"</item>
         <item>"/system/framework/arm64/boot-core-libart.oat"</item>
-   </string-array>
+        <item>"/apex/com.android.runtime/javalib/core-oj.jar"</item>
-
+        <item>"/apex/com.android.runtime/javalib/core-libart.jar"</item>
+        <item>"/apex/com.android.media/javalib/updatable-media.jar"</item>
+    </string-array>
     <!-- The device supports freeform window management -->
     <bool name="config_freeformWindowManagement">true</bool>
 	

overlay/packages/apps/Bluetooth/res/values/config.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009-2012 Broadcom Corporation
+
+     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>
+    <bool name="profile_supported_hfpclient">true</bool>
+    <bool name="profile_supported_avrcp_controller">true</bool>
+    <bool name="profile_supported_sap">true</bool>
+</resources>

overlay/packages/apps/Snap/res/values/config.xml

@@ -15,18 +15,14 @@
 <!-- Camera app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
+
+    <!-- Enable support for camera api v2 -->
+    <bool name="support_camera_api_v2">false</bool>
+
     <!-- Opens back camera using openLegacy() -->
     <bool name="back_camera_open_legacy">false</bool>
 
     <!-- Opens front camera using openLegacy() -->
     <bool name="front_camera_open_legacy">false</bool>
 
-    <!-- Restart preview for front camera onPictureTaken -->
-<!--    <bool name="front_camera_restart_preview_onPictureTaken">true</bool> -->
-
-    <!-- Restart preview for back camera onPictureTaken -->
-<!--    <bool name="back_camera_restart_preview_onPictureTaken">true</bool> -->
-
-    <!-- Restart preview for additional camera onPictureTaken -->
-<!--    <bool name="additional_camera_restart_preview_onPictureTaken">true</bool> -->
 </resources>

overlay/packages/apps/Snap/res/values/qcomstrings.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
-    Copyright (C) 2014-2016 The CyanogenMod Project
-
-    Not a Contribution.
-
-    Copyright (C) 2007 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>
-    <!-- HDR needs 1x frame -->
-    <string name="pref_camera_hdr_need_1x_default" translatable="false">false</string>
-    <string name="pref_camera_auto_hdr_default" translatable="false">enable</string>
-    <string name="pref_camera_scenedetect_default" translatable="false">on</string>
-    <string name="pref_camera_dis_default" translatable="false">enable</string>
-    <string name="pref_camera_longshot_default" translatable="false">on</string>
-</resources>

rootdir/Android.mk

@@ -3,57 +3,44 @@ LOCAL_PATH := $(call my-dir)
 # Device init scripts
 
 include $(CLEAR_VARS)
-LOCAL_MODULE		:= fstab.qcom
+LOCAL_MODULE         := fstab.qcom
-LOCAL_MODULE_TAGS	:= optional eng
+LOCAL_MODULE_CLASS   := ETC
-LOCAL_MODULE_CLASS	:= ETC
+LOCAL_SRC_FILES      := etc/fstab.qcom
-LOCAL_SRC_FILES		:= etc/fstab.qcom
+LOCAL_MODULE_PATH    := $(TARGET_OUT_VENDOR_ETC)
-LOCAL_MODULE_PATH	:= $(TARGET_OUT_VENDOR_ETC)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE		:= init.qcom.rc
+LOCAL_MODULE         := init.qcom.rc
-LOCAL_MODULE_TAGS	:= optional eng
+LOCAL_MODULE_CLASS   := ETC
-LOCAL_MODULE_CLASS	:= ETC
+LOCAL_SRC_FILES      := etc/init.qcom.rc
-LOCAL_SRC_FILES		:= etc/init.qcom.rc
+LOCAL_MODULE_PATH    := $(TARGET_OUT_VENDOR_ETC)/init/hw
-LOCAL_MODULE_PATH	:= $(TARGET_ROOT_OUT)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE		:= init.samsung.rc
+LOCAL_MODULE         := init.samsung.rc
-LOCAL_MODULE_TAGS	:= optional eng
+LOCAL_MODULE_CLASS   := ETC
-LOCAL_MODULE_CLASS	:= ETC
+LOCAL_SRC_FILES      := etc/init.samsung.rc
-LOCAL_SRC_FILES		:= etc/init.samsung.rc
+LOCAL_MODULE_PATH    := $(TARGET_OUT_VENDOR_ETC)/init/hw
-LOCAL_MODULE_PATH	:= $(TARGET_ROOT_OUT)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE		:= init.qcom.usb.rc
+LOCAL_MODULE         := init.qcom.usb.rc
-LOCAL_MODULE_TAGS	:= optional eng
+LOCAL_MODULE_CLASS   := ETC
-LOCAL_MODULE_CLASS	:= ETC
+LOCAL_SRC_FILES      := etc/init.qcom.usb.rc
-LOCAL_SRC_FILES		:= etc/init.qcom.usb.rc
+LOCAL_MODULE_PATH    := $(TARGET_OUT_VENDOR_ETC)/init/hw
-LOCAL_MODULE_PATH	:= $(TARGET_ROOT_OUT)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE		:= ueventd.qcom.rc
+LOCAL_MODULE         := ueventd.qcom.rc
-LOCAL_MODULE_TAGS	:= optional eng
+LOCAL_MODULE_STEM    := ueventd.rc
-LOCAL_MODULE_CLASS	:= ETC
+LOCAL_MODULE_CLASS   := ETC
-LOCAL_SRC_FILES		:= etc/ueventd.qcom.rc
+LOCAL_SRC_FILES      := etc/ueventd.qcom.rc
-LOCAL_MODULE_PATH	:= $(TARGET_ROOT_OUT)
+LOCAL_MODULE_PATH    := $(TARGET_OUT_VENDOR)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE		:= init.qcom.power.rc
+LOCAL_MODULE         := init.qcom.power.rc
-LOCAL_MODULE_TAGS	:= optional eng
+LOCAL_MODULE_CLASS   := ETC
-LOCAL_MODULE_CLASS	:= ETC
+LOCAL_SRC_FILES      := etc/init.qcom.power.rc
-LOCAL_SRC_FILES		:= etc/init.qcom.power.rc
+LOCAL_MODULE_PATH    := $(TARGET_OUT_VENDOR_ETC)/init/hw
-LOCAL_MODULE_PATH	:= $(TARGET_ROOT_OUT)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE		:= init.qcom.sh
-LOCAL_MODULE_TAGS	:= optional eng
-LOCAL_MODULE_CLASS	:= ETC
-LOCAL_SRC_FILES		:= etc/init.qcom.sh
-LOCAL_MODULE_PATH	:= $(TARGET_ROOT_OUT)
 include $(BUILD_PREBUILT)

rootdir/etc/fstab.qcom

@@ -8,15 +8,12 @@
 /dev/block/bootdevice/by-name/cache                 /cache             ext4    nosuid,nodev,noatime,barrier=1                                                 wait,check,formattable
 /dev/block/bootdevice/by-name/apnhlos               /firmware          vfat    ro,shortname=lower,dmask=222,fmask=333,context=u:object_r:firmware_file:s0     wait
 /dev/block/bootdevice/by-name/modem                 /firmware-modem    vfat    ro,shortname=lower,dmask=222,fmask=333,context=u:object_r:firmware_file:s0     wait
-/dev/block/bootdevice/by-name/dsp                   /dsp               ext4    ro,nosuid,nodev,barrier=1,context=u:object_r:dsp_file:s0                       wait
-/dev/block/bootdevice/by-name/persist               /persist           ext4    nosuid,nodev,barrier=1                                                         wait
-/dev/block/bootdevice/by-name/config                /frp               emmc    defaults                                                                       defaults
-/dev/block/bootdevice/by-name/misc                  /misc              emmc    defaults                                                                       defaults
 /dev/block/bootdevice/by-name/efs                   /efs               ext4    nosuid,nodev,noauto_da_alloc,journal_async_commit,data=ordered,errors=panic    wait,check
+/dev/block/bootdevice/by-name/persist               /persist           ext4    nosuid,nodev,barrier=1                                                         wait
 
 /dev/block/bootdevice/by-name/boot                  /boot              emmc    defaults                                                                       recoveryonly
 /dev/block/bootdevice/by-name/recovery              /recovery          emmc    defaults                                                                       recoveryonly
 
 # SDCard
 /devices/soc/74a4900.sdhci/mmc_host/mmc*                        auto    auto    defaults    voldmanaged=sdcard:auto,encryptable=userdata
-/devices/soc/6a00000.ssusb/6a00000.dwc3/xhci-hcd.0.auto/usb*    auto    auto    defaults    voldmanaged=usb:auto
+/devices/soc/6a00000.ssusb/6a00000.dwc3/xhci-hcd.0.auto/usb*    auto    auto    defaults    voldmanaged=usb:auto

rootdir/etc/init.qcom.rc

@@ -25,9 +25,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-import init.qcom.power.rc
+import /vendor/etc/init/hw/init.qcom.power.rc
-import init.qcom.usb.rc
+import /vendor/etc/init/hw/init.qcom.usb.rc
-import init.samsung.rc
+import /vendor/etc/init/hw/init.samsung.rc
 
 on early-init
     mount debugfs debugfs /sys/kernel/debug
@@ -429,6 +429,7 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
     #   group wifi inet keystore
     interface android.hardware.wifi.supplicant@1.0::ISupplicant default
     interface android.hardware.wifi.supplicant@1.1::ISupplicant default
+    interface android.hardware.wifi.supplicant@1.2::ISupplicant default
     class main
     socket wpa_wlan0 dgram 660 wifi wifi
     disabled
@@ -449,11 +450,6 @@ service loc_launcher /vendor/bin/loc_launcher
     group gps
     writepid /dev/cpuset/system-background/tasks
 
-service qcom-sh /vendor/bin/init.qcom.sh
-    class late_start
-    user root
-    oneshot
-
 on property:ro.vendor.ril.mbn_copy_completed=1
     write /data/vendor/radio/copy_complete 1
 

rootdir/etc/init.qcom.sh

@@ -1,64 +0,0 @@
-#!/vendor/bin/sh
-# Copyright (c) 2009-2016, 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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.
-#
-
-#
-# Make modem config folder and copy firmware config to that folder for RIL
-#
-if [ -f /data/vendor/radio/ver_info.txt ]; then
-    prev_version_info=`cat /data/vendor/radio/ver_info.txt`
-else
-    prev_version_info=""
-fi
-
-cur_version_info=`cat /firmware/verinfo/ver_info.txt`
-if [ ! -f /firmware/verinfo/ver_info.txt -o "$prev_version_info" != "$cur_version_info" ]; then
-    rm -rf /data/vendor/radio/modem_config
-    mkdir /data/vendor/radio/modem_config
-    chmod 770 /data/vendor/radio/modem_config
-    cp -r /firmware/image/modem_pr/mcfg/configs/* /data/vendor/radio/modem_config
-    chown -hR radio.radio /data/vendor/radio/modem_config
-    cp /firmware/verinfo/ver_info.txt /data/vendor/radio/ver_info.txt
-    chown radio.radio /data/vendor/radio/ver_info.txt
-fi
-cp /firmware/image/modem_pr/mbn_ota.txt /data/vendor/radio/modem_config
-chown radio.radio /data/vendor/radio/modem_config/mbn_ota.txt
-echo 1 > /data/vendor/radio/copy_complete
-
-# Check build variant for printk logging
-# Current default minimum boot-time-default
-buildvariant=`getprop ro.build.type`
-case "$buildvariant" in
-    "userdebug" | "eng")
-        #set default loglevel to KERN_INFO
-        echo "6 6 1 7" > /proc/sys/kernel/printk
-        ;;
-    *)
-        #set default loglevel to KERN_WARNING
-        echo "4 4 1 4" > /proc/sys/kernel/printk
-        ;;
-esac

rootdir/etc/init.samsung.rc

@@ -12,6 +12,32 @@ on post-fs-data
     chown system radio /sys/class/fingerprint/fingerprint/adm
     chown system radio /sys/class/fingerprint/fingerprint/bfs_values
 
+    # If there is no post-fs-data action in the init.<device>.rc file, you
+    # must uncomment this line, otherwise encrypted filesystems
+    # won't work.
+    # Set indication (checked by vold) that we have finished this action
+    #setprop vold.post_fs_data_done 1
+    # FINGERPRINT
+#    fp_migration /data/biometrics /data/vendor/biometrics
+    mkdir /data/vendor/biometrics 0770 system system
+    mkdir /data/vendor/fpSnrTest 0770 system system
+    restorecon_recursive /data/vendor/biometrics
+
+on init
+    # MUIC
+    chown system radio /sys/class/sec/switch/adc
+    chown system radio /sys/class/sec/switch/otg_test
+    chown system radio /sys/class/sec/switch/uart_sel
+    chown system radio /sys/class/sec/switch/usb_sel
+    chown system system /sys/class/sec/switch/afc_off
+    chown system radio /sys/class/sec/switch/afc_disable
+    chown system radio /sys/class/sec/switch/apo_factory
+    chown system radio /sys/class/sec/switch/afc_set_voltage
+    chown system radio /sys/class/sec/switch/vbus_value
+    chown system radio /sys/class/sec/switch/vbus_value_pd
+    chown system radio /sys/class/sec/switch/vbus_rawdata
+    chown system radio /sys/class/sec/switch/keyboard_test
+
 on boot
     #Create directories for Fingerprint
     mkdir /data/vendor/misc/qti_fp 0770 system system
@@ -277,6 +303,139 @@ on boot
 #Meta event
     chown system radio /sys/class/sensors/sensor_dev/flush
 
+# MSP FactoryApp
+    mkdir /efs/FactoryApp 0775 system system
+
+# Permissions for Charging
+    mkdir /efs/Battery 0775 radio system
+    chown radio system /efs/Battery
+    chmod 0775 /efs/Battery
+    copy /system/vendor/firmware/battery_data.dat /efs/Battery/battery_data.dat
+    chmod 0400 /efs/Battery/battery_data.dat
+    write /sys/class/power_supply/battery/batt_update_data "/efs/Battery/battery_data.dat"
+    chown system radio /sys/class/power_supply/battery/batt_ext_dev_chg
+    chown system radio /efs/Battery/fg_full_voltage
+    chown system radio /sys/class/power_supply/battery/fg_full_voltage
+    chown system radio /sys/class/power_supply/battery/batt_self_discharging_control
+    chown system radio /sys/class/power_supply/battery/batt_inbat_wireless_cs100
+    chmod 0664 /efs/Battery/fg_full_voltage
+    chmod 0664 /sys/class/power_supply/battery/fg_full_voltage
+    chown system radio /sys/class/power_supply/battery/batt_reset_soc
+    chown system radio /sys/class/power_supply/battery/batt_slate_mode
+    chown system radio /sys/class/power_supply/battery/factory_mode
+    chown system radio /sys/class/power_supply/battery/siop_level
+    chown system radio /sys/class/power_supply/battery/siop_event
+    chown system radio /sys/class/power_supply/battery/wc_enable
+    chown system nfc /sys/class/power_supply/battery/wc_control
+    chown system nfc /sys/class/power_supply/battery/wc_control_cnt
+    chown system radio /sys/class/power_supply/battery/update
+    chown system radio /sys/class/power_supply/battery/batt_wdt_control
+    chown media sdcard_rw /sys/class/power_supply/battery/store_mode
+    chown sdcard_rw sdcard_rw /sys/class/power_supply/battery/call
+    chown sdcard_rw sdcard_rw /sys/class/power_supply/battery/video
+    chown sdcard_rw sdcard_rw /sys/class/power_supply/battery/music
+    chown sdcard_rw sdcard_rw /sys/class/power_supply/battery/browser
+    chown sdcard_rw sdcard_rw /sys/class/power_supply/battery/hotspot
+    chown sdcard_rw sdcard_rw /sys/class/power_supply/battery/camera
+    chown system radio /sys/class/power_supply/battery/talk_wcdma
+    chown system radio /sys/class/power_supply/battery/talk_gsm
+    chown system radio /sys/class/power_supply/battery/call
+    chown system radio /sys/class/power_supply/battery/data_call
+    chown system radio /sys/class/power_supply/battery/gps
+    chown system radio /sys/class/power_supply/battery/wifi
+    chown system radio /sys/class/power_supply/battery/lte
+    chown system radio /sys/class/power_supply/battery/lcd
+    chown system radio /sys/class/power_supply/ps/status
+    chmod 0664 /sys/class/power_supply/battery/wc_control
+    chmod 0664 /sys/class/power_supply/battery/wc_control_cnt
+    chmod 0664 /sys/class/power_supply/ps/status
+    chmod 0664 /sys/class/power_supply/battery/batt_temp_table
+    chown system radio /sys/class/power_supply/battery/batt_temp_table
+    chown system radio /sys/class/power_supply/battery/batt_high_current_usb
+    chown system radio /sys/class/power_supply/battery/batt_inbat_voltage
+    chmod 0664 /sys/class/power_supply/battery/batt_high_current_usb
+    chown system radio /sys/class/power_supply/battery/hmt_ta_connected
+    chown system radio /sys/class/power_supply/battery/hmt_ta_charge
+    chown system radio /sys/class/power_supply/battery/battery_cycle
+    chown system radio /sys/class/power_supply/otg/online
+    chmod 0664 /sys/class/power_supply/otg/online
+    chown system radio /sys/class/power_supply/battery/charge_otg_control
+    chown system radio /sys/class/power_supply/battery/charge_uno_control
+    chown system radio /sys/class/power_supply/battery/batt_wireless_firmware_update
+    chown system radio /sys/class/power_supply/battery/otp_firmware_result
+    chown system radio /sys/class/power_supply/battery/wc_ic_grade
+    chown system radio /sys/class/power_supply/battery/otp_firmware_ver_bin
+    chown system radio /sys/class/power_supply/battery/otp_firmware_ver
+    chown system radio /sys/class/power_supply/battery/tx_firmware_result
+    chown system radio /sys/class/power_supply/battery/batt_tx_firmware
+    chown system radio /sys/class/power_supply/battery/batt_hv_wireless_status
+    chown system radio /sys/class/power_supply/battery/batt_hv_wireless_pad_ctrl
+    chmod 0664 /sys/class/power_supply/battery/charge_otg_control
+    chmod 0664 /sys/class/power_supply/battery/charge_uno_control
+    chmod 0664 /sys/class/power_supply/battery/batt_wireless_firmware_update
+    chmod 0664 /sys/class/power_supply/battery/otp_firmware_result
+    chmod 0664 /sys/class/power_supply/battery/wc_ic_grade
+    chmod 0664 /sys/class/power_supply/battery/otp_firmware_ver_bin
+    chmod 0664 /sys/class/power_supply/battery/otp_firmware_ver
+    chmod 0664 /sys/class/power_supply/battery/tx_firmware_result
+    chmod 0664 /sys/class/power_supply/battery/tx_firmware_ver
+    chmod 0664 /sys/class/power_supply/battery/batt_tx_firmware
+    chmod 0664 /sys/class/power_supply/battery/batt_hv_wireless_status
+    chmod 0664 /sys/class/power_supply/battery/batt_hv_wireless_pad_ctrl
+    chown system radio /sys/class/power_supply/battery/tx_firmware_result
+    chown system radio /sys/class/power_supply/battery/batt_tune_chg_limit_cur
+    chown system radio /sys/class/power_supply/battery/batt_tune_chg_temp_high
+    chown system radio /sys/class/power_supply/battery/batt_tune_chg_temp_rec
+    chown system radio /sys/class/power_supply/battery/batt_tune_coil_limit_cur
+    chown system radio /sys/class/power_supply/battery/batt_tune_coil_temp_high
+    chown system radio /sys/class/power_supply/battery/batt_tune_coil_temp_rec
+    chown system radio /sys/class/power_supply/battery/batt_tune_fast_charge_current
+    chown system radio /sys/class/power_supply/battery/batt_tune_float_voltage
+    chown system radio /sys/class/power_supply/battery/batt_tune_intput_charge_current
+    chown system radio /sys/class/power_supply/battery/batt_tune_temp_high_normal
+    chown system radio /sys/class/power_supply/battery/batt_tune_temp_high_rec_normal
+    chown system radio /sys/class/power_supply/battery/batt_tune_temp_low_normal
+    chown system radio /sys/class/power_supply/battery/batt_tune_temp_low_rec_normal
+    chown system radio /sys/class/power_supply/battery/batt_tune_ui_term_cur_1st
+    chown system radio /sys/class/power_supply/battery/batt_tune_ui_term_cur_2nd
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_chg_limit_cur
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_chg_temp_high
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_chg_temp_rec
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_coil_limit_cur
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_coil_temp_high
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_coil_temp_rec
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_fast_charge_current
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_float_voltage
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_intput_charge_current
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_temp_high_normal
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_temp_high_rec_normal
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_temp_low_normal
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_temp_low_rec_normal
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_ui_term_cur_1st
+    chmod 0664 /sys/class/power_supply/battery/batt_tune_ui_term_cur_2nd
+    chown system radio /sys/class/power_supply/battery/batt_filter_cfg
+    chown system radio /sys/class/power_supply/battery/batt_current_ua_avg
+    chown system radio /sys/class/power_supply/battery/batt_current_ua_now
+    chown system radio /sys/class/power_supply/battery/voltage_avg
+    chown system radio /sys/class/power_supply/battery/voltage_now
+    chown system radio /sys/class/power_supply/battery/mode
+    chmod 0664 /sys/class/power_supply/battery/mode
+    chown system radio /sys/class/power_supply/battery/safety_timer_set
+    chown system radio /sys/class/power_supply/battery/safety_timer_info
+    chown system radio /sys/class/power_supply/battery/wc_op_freq
+    chmod 0664 /sys/class/power_supply/battery/wc_op_freq
+    chown system radio /sys/class/power_supply/battery/wc_cmd_info
+    chmod 0664 /sys/class/power_supply/battery/wc_cmd_info
+    chown system radio /sys/class/power_supply/smb1351-charger/mode
+    chown system radio /sys/class/power_supply/battery/cisd_fullcaprep_max
+    chmod 0660 /sys/class/power_supply/battery/cisd_fullcaprep_max
+    chown system radio /sys/class/power_supply/battery/cisd_wire_count
+    chmod 0660 /sys/class/power_supply/battery/cisd_wire_count
+    chown system radio /sys/class/power_supply/battery/cisd_data
+    chmod 0660 /sys/class/power_supply/battery/cisd_data
+    chown system system /efs/FactoryApp/cisd_data
+    chmod 0640 /efs/FactoryApp/cisd_data
+
 service wifiloader /system/bin/wifiloader
     class main
     oneshot

sepolicy/adddd.te

@@ -1,9 +1,58 @@
 #============= hal_bluetooth_qti ==============
 allow hal_bluetooth_qti bluetooth_data_file:dir { write add_name };
+allow hal_bluetooth_qti bluetooth_data_file:file { create open read write };
 
 #============= init ==============
 allow init proc:file { read getattr };
+allow init rootfs:file execute_no_trans;
+allow init vendor_toolbox_exec:file execute_no_trans;
+allow init hal_lineage_touch_hwservice:hwservice_manager add;
 
 #============= system_app ==============
 allow system_app perfprofd:binder call;
 allow system_app wificond:binder call;
+
+#============= system_server ==============
+allow system_server init:binder call;
+
+#============= hwservicemanager ==============
+allow hwservicemanager init:binder call;
+allow hwservicemanager init:file open;
+allow hwservicemanager init:process getattr;
+
+#============= untrusted_app ==============
+allow untrusted_app selinuxfs:file open;
+
+#============= untrusted_app_27 ==============
+allow untrusted_app_27 apk_data_file:file setattr;
+allow untrusted_app_27 proc:file open;
+allow untrusted_app_27 proc:file getattr;
+
+#============= cameraserver ==============
+allow cameraserver sysfs_graphics:file read;
+
+#============= mm-qcamerad ==============
+allow mm-qcamerad camera_data_file:dir write;
+
+#============= system_app ==============
+allow system_app init:binder call;
+
+#============= keystore ==============
+allow keystore vendor_tee_listener_prop:file { read open getattr };
+
+#============= hal_fingerprint_default ==============
+allow hal_fingerprint_default vendor_data_file:dir { read write open add_name create remove_name rmdir };
+allow hal_fingerprint_default vendor_data_file:file { read write open create getattr rename unlink };
+
+#============= tee ==============
+allow tee vendor_default_prop:property_service set;
+
+#============= netutils_wrapper ==============
+allow netutils_wrapper netmgrd:socket { read write };
+
+
+#============= hal_lineage_touch_default ==============
+allow hal_lineage_touch_default sysfs:file read;
+
+#============= system_server ==============
+allow system_server mnt_vendor_file:dir getattr;

sepolicy/file.te

@@ -6,3 +6,4 @@ type biometrics_data_file, file_type, data_file_type;
 type dsp_file, fs_type, contextmount_type;
 type sysfs_sec, fs_type, sysfs_type;
 type sysfs_camera, fs_type, sysfs_type;
+type battery_efs_file, file_type;

sepolicy/file_contexts

@@ -29,18 +29,23 @@
 /dev/mobicore                u:object_r:tee_device:s0
 /dev/mobicore-user           u:object_r:tee_device:s0
 
+/sys/class/power_supply/battery/batt_update_data     u:object_r:rootfs:s0
+
+#/sys/devices/soc/7464900.sdhci/clkscale_enable       u:object_r:sysfs_scsi_host:s0
+#/sys/kernel/tracing/tracing_on               u:object_r:debugfs_trace_marker:s0
+#/sys/block/mmcblk0/queue/scheduler
+
 # sysfs
 /sys/devices/virtual/camera(/.*)?                                u:object_r:sysfs_camera:s0
 /sys/devices/virtual/sec/sec_key/hall_irq_ctrl                   u:object_r:sysfs_sec:s0
 
-/system/bin/wifiloader       u:object_r:wifiloader_exec:s0
-
-/vendor/bin/factory.adsp     u:object_r:wifiloader_exec:s0
-
-/system/vendor/bin/hw/vendor\.samsung\.hardware\.biometrics\.fingerprint@2\.1-service u:object_r:hal_fingerprint_default_exec:s0
-
-/dev/block/mmcblk0p27                   u:object_r:e2fsck_device:s0
-
 # HALs
-/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.1-service\.clearkey         u:object_r:hal_drm_clearkey_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.0-service\.clearkey         u:object_r:hal_drm_clearkey_exec:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.1-service\.widevine         u:object_r:hal_drm_widevine_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.0-service\.widevine         u:object_r:hal_drm_widevine_exec:s0
+
+/(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.0-service\.samsung-qcom         u:object_r:hal_lineage_livedisplay_sysfs_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service.samsung                     u:object_r:hal_lineage_touch_default_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.biometrics\.fingerprint@2\.1-service u:object_r:hal_fingerprint_default_exec:s0
+
+/system/bin/wifiloader                         u:object_r:wifiloader_exec:s0
+/(vendor|system/vendor)/bin/wifiloader         u:object_r:wifiloader_exec:s0

sepolicy/genfs_contexts

@@ -1 +1,9 @@
 genfscon debugfs /rmt_storage u:object_r:debugfs_rmt:s0
+
+genfscon sysfs /devices/soc/6a00000.ssusb/6a00000.dwc3/gadget/lun0/     u:object_r:sysfs_android_usb:s0
+genfscon sysfs /devices/soc/6a00000.ssusb/power_supply                  u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /devices/soc/75b5000.i2c/i2c-7/7-001d/power_supply       u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /devices/soc/msm-bcl-19/power_supply                     u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /devices/soc/qpnp-fg-22/power_supply                     u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /devices/soc/qpnp-smbcharger-21/power_supply             u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /devices/soc/soc:qcom,bcl/power_supply                   u:object_r:sysfs_batteryinfo:s0

sepolicy/hal_lineage_livedisplay_sysfs.te

@@ -0,0 +1,14 @@
+# Allow LiveDisplay to store files under /data/vendor/display and access them
+allow hal_lineage_livedisplay_sysfs display_vendor_data_file:dir rw_dir_perms;
+allow hal_lineage_livedisplay_sysfs display_vendor_data_file:file create_file_perms;
+
+# Allow LiveDisplay to read and write to files in sysfs_graphics, sysfs_mdnie
+allow hal_lineage_livedisplay_sysfs {
+    sysfs_graphics
+    sysfs_mdnie
+}:dir search;
+
+allow hal_lineage_livedisplay_sysfs {
+    sysfs_graphics
+    sysfs_mdnie
+}:file rw_file_perms;

sepolicy/hvdcp.te

@@ -1,3 +1,6 @@
 allow hvdcp sysfs:file { open read };
 allow hvdcp sysfs:dir write;
-allow hvdcp self:capability dac_override;
+
+dontaudit hvdcp self:capability dac_override;
+
+r_dir_file(hvdcp, sysfs_batteryinfo)

sepolicy/wifiloader.te

@@ -1,7 +1,7 @@
 #### wifiloader
 #
 type wifiloader, domain;
-type wifiloader_exec, exec_type, file_type;
+type wifiloader_exec, exec_type, file_type, vendor_file_type;
 
 init_daemon_domain(wifiloader)
 

sepolicy_tmp/common/file.te

@@ -0,0 +1,2 @@
+type firmware_file, file_type;
+type persist_file, file_type;

sepolicy_tmp/common/file_contexts

@@ -0,0 +1,4 @@
+/firmware(/.*)?                 u:object_r:firmware_file:s0
+/firmware-modem(/.*)?           u:object_r:firmware_file:s0
+/bt_firmware(/.*)?              u:object_r:firmware_file:s0
+/persist(/.*)?                  u:object_r:persist_file:s0

sepolicy_tmp/sepolicy.mk

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017 The LineageOS 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.
@@ -14,6 +14,5 @@
 # limitations under the License.
 #
 
-LOCAL_PATH := $(call my-dir)
+BOARD_SEPOLICY_DIRS += \
-
+    device/samsung/gts3llte/sepolicy_tmp/common
-include $(call all-makefiles-under,$(LOCAL_PATH))

shims/libbauthtzcommon/Android.mk

@@ -1,28 +0,0 @@
-# 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.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    libbauthtzcommon.c
-
-LOCAL_SHARED_LIBRARIES := liblog
-
-LOCAL_MODULE := libbauthtzcommon_shim
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_VENDOR_MODULE := true
-
-include $(BUILD_SHARED_LIBRARY)

shims/libbauthtzcommon/libbauthtzcommon.c

@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-#define LOG_TAG "libbauthtzcommon_shim"
-#define LOG_NDEBUG 0
-
-#include <cutils/log.h>
-
-int BAuth_Hat_OP(void *dest, int dummy)
-{
-    ALOGV("SHIM: hijacking %s!", __func__);
-
-    /*
-     * This function is supposed to pass the hardware authentication token
-     * (HAT) to the mobicore trustlet.
-     */
-
-    return 0;
-}

shims/libcameraclient_shim/Android.mk

@@ -1,26 +0,0 @@
-# Copyright (C) 2016 The CyanogenMod 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.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := camera_cameraclient.cpp
-
-LOCAL_MODULE := libshims_cameraclient
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_VENDOR_MODULE := true
-
-include $(BUILD_SHARED_LIBRARY)

shims/libcameraclient_shim/camera_cameraclient.cpp

@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2017 TeamNexus
- *
- * 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.
- */
-
-#include "camera_cameraclient.h"
-
-namespace android
-{
-    const char CameraParameters::ISO_SPORTS[] = "sports";
-    const char CameraParameters::KEY_CITYID[] = "contextualtag-cityid";
-    const char CameraParameters::KEY_RT_HDR[] = "rt-hdr";
-    const char CameraParameters::RTHDR_AUTO[] = "auto"; // ???
-    const char CameraParameters::EFFECT_COLD[] = "cold";
-    const char CameraParameters::EFFECT_WARM[] = "warm";
-    const char CameraParameters::KEY_WEATHER[] = "weather";
-    const char CameraParameters::OIS_ON_VDIS[] = "on"; // ???
-    const char CameraParameters::OIS_ON_ZOOM[] = "on"; // ???
-    const char CameraParameters::KEY_APERTURE[] = "aperture";
-    const char CameraParameters::KEY_CONTRAST[] = "contrast";
-    const char CameraParameters::KEY_METERING[] = "metering";
-    const char CameraParameters::KEY_PHASE_AF[] = "phase-af";
-    const char CameraParameters::KEY_RAW_SAVE[] = "raw-save";
-    const char CameraParameters::METERING_OFF[] = "off";
-    const char CameraParameters::OIS_ON_STILL[] = "on"; // ???
-    const char CameraParameters::OIS_ON_VIDEO[] = "on"; // ???
-    const char CameraParameters::CONTINUOUS_ON[] = "on"; // ???
-    const char CameraParameters::EFFECT_WASHED[] = "washed";
-    const char CameraParameters::KEY_SHARPNESS[] = "sharpness";
-    const char CameraParameters::METERING_SPOT[] = "spot";
-    const char CameraParameters::OIS_CENTERING[] = "center"; // ???
-    const char CameraParameters::OIS_ON_SINE_X[] = "sine_x";
-    const char CameraParameters::OIS_ON_SINE_Y[] = "sine_y";
-    const char CameraParameters::CONTINUOUS_OFF[] = "off";  // ???
-    const char CameraParameters::EFFECT_ANTIQUE[] = "antique";
-    const char CameraParameters::KEY_AUTO_VALUE[] = "auto";
-    const char CameraParameters::KEY_FACEDETECT[] = "face-detection";
-    const char CameraParameters::KEY_SATURATION[] = "saturation";
-    const char CameraParameters::KEY_BRACKET_AEB[] = "aeb-value";
-    const char CameraParameters::KEY_BRACKET_WBB[] = "wbb-value";
-    const char CameraParameters::KEY_FOCUS_RANGE[] = "focus-range";
-    const char CameraParameters::METERING_CENTER[] = "center";
-    const char CameraParameters::METERING_MATRIX[] = "matrix";
-    const char CameraParameters::WHITE_BALANCE_K[] = "wb-k";
-    const char CameraParameters::BRACKET_MODE_AEB[] = "aeb";
-    const char CameraParameters::BRACKET_MODE_OFF[] = "off";
-    const char CameraParameters::BRACKET_MODE_WBB[] = "wbb";
-    const char CameraParameters::EFFECT_POINT_RED[] = "point-red";
-    const char CameraParameters::FLASH_STANDBY_ON[] = "on"; // ???
-    const char CameraParameters::FOCUS_AREA_MULTI[] = "multi"; // ???
-    const char CameraParameters::FOCUS_MODE_MULTI[] = "multi"; // ???
-    const char CameraParameters::FOCUS_MODE_TOUCH[] = "touch";
-    const char CameraParameters::FOCUS_RANGE_AUTO[] = "auto"; // ???
-    const char CameraParameters::EFFECT_POINT_BLUE[] = "point-blue";
-    const char CameraParameters::FLASH_MODE_FILLIN[] = "fillin";
-    const char CameraParameters::FLASH_STANDBY_OFF[] = "off"; // ???
-    const char CameraParameters::FOCUS_AREA_CENTER[] = "center";
-    const char CameraParameters::FOCUS_MODE_MANUAL[] = "manual";
-    const char CameraParameters::FOCUS_RANGE_MACRO[] = "macro";
-    const char CameraParameters::KEY_EXPOSURE_TIME[] = "exposure-time";
-    const char CameraParameters::KEY_OIS_SUPPORTED[] = "ois_supported";
-    const char CameraParameters::KEY_SHUTTER_SPEED[] = "pref_shutter_speed_key";
-    const char CameraParameters::FLASH_VALUE_OF_ISP[] = "flash-value-of-isp";
-    const char CameraParameters::EFFECT_POINT_YELLOW[] = "point-yellow";
-    const char CameraParameters::FACEDETECT_MODE_OFF[] = "off"; // ???
-    const char CameraParameters::KEY_CONTINUOUS_MODE[] = "continuous-mode";
-    const char CameraParameters::KEY_CURRENT_ADDRESS[] = "current-address";
-    const char CameraParameters::KEY_FOCUS_AREA_MODE[] = "focus-area-mode";
-    const char CameraParameters::KEY_WHITE_BALANCE_K[] = "wb-k";
-    const char CameraParameters::FLASH_MODE_SLOW_SYNC[] = "slow"; // ???
-    const char CameraParameters::IMAGE_STABILIZER_OFF[] = "off";
-    const char CameraParameters::IMAGE_STABILIZER_OIS[] = "ois";
-    const char CameraParameters::KEY_IMAGE_STABILIZER[] = "image-stabilizer";
-    const char CameraParameters::KEY_SUPPORTED_RT_HDR[] = "rt-hdr-values";
-    const char CameraParameters::SCENE_MODE_DUSK_DAWN[] = "dusk-dawn";
-    const char CameraParameters::FACEDETECT_MODE_BLINK[] = "blink";
-    const char CameraParameters::FOCUS_MODE_FIXED_FACE[] = "fixed-face";
-    const char CameraParameters::FOCUS_MODE_SMART_SELF[] = "self";
-    const char CameraParameters::KEY_MAX_EXPOSURE_TIME[] = "max-exposure-time";
-    const char CameraParameters::KEY_MIN_EXPOSURE_TIME[] = "min-exposure-time";
-    const char CameraParameters::SCENE_MODE_BACK_LIGHT[] = "back-light";
-    const char CameraParameters::SCENE_MODE_BEACH_SNOW[] = "beach-snow";
-    const char CameraParameters::SCENE_MODE_FALL_COLOR[] = "fall-color";
-    const char CameraParameters::SMART_SCENE_DETECT_ON[] = "on"; // ???
-    const char CameraParameters::FACEDETECT_MODE_NORMAL[] = "normal";
-    const char CameraParameters::FLASH_MODE_RED_EYE_FIX[] = "red-eye-fix";
-    const char CameraParameters::FOCUS_AREA_SMART_TOUCH[] = "smart-touch";
-    const char CameraParameters::FOCUS_RANGE_AUTO_MACRO[] = "auto-macro";
-    const char CameraParameters::KEY_SUPPORTED_PHASE_AF[] = "phase-af";
-    const char CameraParameters::SMART_SCENE_DETECT_OFF[] = "off"; // ???
-    const char CameraParameters::IMAGE_STABILIZER_DUALIS[] = "dual-is";
-    const char CameraParameters::KEY_SUPPORTED_OIS_MODES[] = "ois-mode-values";
-    const char CameraParameters::FACEDETECT_MODE_SMILESHOT[] = "smilshot";
-    const char CameraParameters::FOCUS_MODE_FACE_DETECTION[] = "face-detection";
-    const char CameraParameters::KEY_DYNAMIC_RANGE_CONTROL[] = "dynamic-range-control";
-    const char CameraParameters::FOCUS_MODE_OBJECT_TRACKING[] = "object-tracking";
-    const char CameraParameters::KEY_CAPTURE_BURST_FILEPATH[] = "capture-burst-filepath";
-    const char CameraParameters::PIXEL_FORMAT_YUV420SP_NV21[] = "nv21";
-    const char CameraParameters::KEY_SUPPORTED_DYNAMIC_RANGE_CONTROL[] = "dynamic-range-control-values";
-    const char CameraParameters::KEY_SUPPORTED_EFFECT_PREVIEW_FPS_RANGE[] = "preview-fps-range";
-    const char CameraParameters::DRC_ON[] = "on";
-    const char CameraParameters::ISO_50[] = "50";
-    const char CameraParameters::ISO_80[] = "80";
-    const char CameraParameters::PAF_ON[] = "on"; // ???
-    const char CameraParameters::DRC_OFF[] = "off";
-    const char CameraParameters::ISO_100[] = "100";
-    const char CameraParameters::ISO_200[] = "200";
-    const char CameraParameters::ISO_400[] = "400";
-    const char CameraParameters::ISO_800[] = "800";
-    const char CameraParameters::KEY_ISO[] = "iso";
-    const char CameraParameters::KEY_OIS[] = "ois";
-    const char CameraParameters::OIS_OFF[] = "off"; // ???
-    const char CameraParameters::PAF_OFF[] = "off"; // ???
-    const char CameraParameters::ISO_1600[] = "1600";
-    const char CameraParameters::ISO_3200[] = "3200";
-    const char CameraParameters::ISO_6400[] = "6400";
-    const char CameraParameters::ISO_AUTO[] = "auto";
-    const char CameraParameters::RTHDR_ON[] = "on";
-    const char CameraParameters::ISO_NIGHT[] = "night";
-    const char CameraParameters::RTHDR_OFF[] = "off";
-
-    int CameraParameters::getInt64(const char *key) const { return -1; }
-};
-
-extern "C" void _ZN7android20DisplayEventReceiverC1Ev()
-{
-}

shims/libcameraclient_shim/camera_cameraclient.h

@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2017 TeamNexus
- *
- * 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.
- */
-
-namespace android
-{
-
-class CameraParameters
-{
-public:
-    static const char ISO_SPORTS[];
-    static const char KEY_CITYID[];
-    static const char KEY_RT_HDR[];
-    static const char RTHDR_AUTO[];
-    static const char EFFECT_COLD[];
-    static const char EFFECT_WARM[];
-    static const char KEY_WEATHER[];
-    static const char OIS_ON_VDIS[];
-    static const char OIS_ON_ZOOM[];
-    static const char KEY_APERTURE[];
-    static const char KEY_CONTRAST[];
-    static const char KEY_METERING[];
-    static const char KEY_PHASE_AF[];
-    static const char KEY_RAW_SAVE[];
-    static const char METERING_OFF[];
-    static const char OIS_ON_STILL[];
-    static const char OIS_ON_VIDEO[];
-    static const char CONTINUOUS_ON[];
-    static const char EFFECT_WASHED[];
-    static const char KEY_SHARPNESS[];
-    static const char METERING_SPOT[];
-    static const char OIS_CENTERING[];
-    static const char OIS_ON_SINE_X[];
-    static const char OIS_ON_SINE_Y[];
-    static const char CONTINUOUS_OFF[];
-    static const char EFFECT_ANTIQUE[];
-    static const char KEY_AUTO_VALUE[];
-    static const char KEY_FACEDETECT[];
-    static const char KEY_SATURATION[];
-    static const char KEY_BRACKET_AEB[];
-    static const char KEY_BRACKET_WBB[];
-    static const char KEY_FOCUS_RANGE[];
-    static const char METERING_CENTER[];
-    static const char METERING_MATRIX[];
-    static const char WHITE_BALANCE_K[];
-    static const char BRACKET_MODE_AEB[];
-    static const char BRACKET_MODE_OFF[];
-    static const char BRACKET_MODE_WBB[];
-    static const char EFFECT_POINT_RED[];
-    static const char FLASH_STANDBY_ON[];
-    static const char FOCUS_AREA_MULTI[];
-    static const char FOCUS_MODE_MULTI[];
-    static const char FOCUS_MODE_TOUCH[];
-    static const char FOCUS_RANGE_AUTO[];
-    static const char EFFECT_POINT_BLUE[];
-    static const char FLASH_MODE_FILLIN[];
-    static const char FLASH_STANDBY_OFF[];
-    static const char FOCUS_AREA_CENTER[];
-    static const char FOCUS_MODE_MANUAL[];
-    static const char FOCUS_RANGE_MACRO[];
-    static const char KEY_EXPOSURE_TIME[];
-    static const char KEY_OIS_SUPPORTED[];
-    static const char KEY_SHUTTER_SPEED[];
-    static const char FLASH_VALUE_OF_ISP[];
-    static const char EFFECT_POINT_YELLOW[];
-    static const char FACEDETECT_MODE_OFF[];
-    static const char KEY_CONTINUOUS_MODE[];
-    static const char KEY_CURRENT_ADDRESS[];
-    static const char KEY_FOCUS_AREA_MODE[];
-    static const char KEY_WHITE_BALANCE_K[];
-    static const char FLASH_MODE_SLOW_SYNC[];
-    static const char IMAGE_STABILIZER_OFF[];
-    static const char IMAGE_STABILIZER_OIS[];
-    static const char KEY_IMAGE_STABILIZER[];
-    static const char KEY_SUPPORTED_RT_HDR[];
-    static const char SCENE_MODE_DUSK_DAWN[];
-    static const char FACEDETECT_MODE_BLINK[];
-    static const char FOCUS_MODE_FIXED_FACE[];
-    static const char FOCUS_MODE_SMART_SELF[];
-    static const char KEY_MAX_EXPOSURE_TIME[];
-    static const char KEY_MIN_EXPOSURE_TIME[];
-    static const char SCENE_MODE_BACK_LIGHT[];
-    static const char SCENE_MODE_BEACH_SNOW[];
-    static const char SCENE_MODE_FALL_COLOR[];
-    static const char SMART_SCENE_DETECT_ON[];
-    static const char FACEDETECT_MODE_NORMAL[];
-    static const char FLASH_MODE_RED_EYE_FIX[];
-    static const char FOCUS_AREA_SMART_TOUCH[];
-    static const char FOCUS_RANGE_AUTO_MACRO[];
-    static const char KEY_SUPPORTED_PHASE_AF[];
-    static const char SMART_SCENE_DETECT_OFF[];
-    static const char IMAGE_STABILIZER_DUALIS[];
-    static const char KEY_SUPPORTED_OIS_MODES[];
-    static const char FACEDETECT_MODE_SMILESHOT[];
-    static const char FOCUS_MODE_FACE_DETECTION[];
-    static const char KEY_DYNAMIC_RANGE_CONTROL[];
-    static const char FOCUS_MODE_OBJECT_TRACKING[];
-    static const char KEY_CAPTURE_BURST_FILEPATH[];
-    static const char PIXEL_FORMAT_YUV420SP_NV21[];
-    static const char KEY_SUPPORTED_DYNAMIC_RANGE_CONTROL[];
-    static const char KEY_SUPPORTED_EFFECT_PREVIEW_FPS_RANGE[];
-    static const char DRC_ON[];
-    static const char ISO_50[];
-    static const char ISO_80[];
-    static const char PAF_ON[];
-    static const char DRC_OFF[];
-    static const char ISO_100[];
-    static const char ISO_200[];
-    static const char ISO_400[];
-    static const char ISO_800[];
-    static const char KEY_ISO[];
-    static const char KEY_OIS[];
-    static const char OIS_OFF[];
-    static const char PAF_OFF[];
-    static const char ISO_1600[];
-    static const char ISO_3200[];
-    static const char ISO_6400[];
-    static const char ISO_AUTO[];
-    static const char RTHDR_ON[];
-    static const char ISO_NIGHT[];
-    static const char RTHDR_OFF[];
-
-    int getInt64(const char *key) const;
-};
-	
-};

system.prop

@@ -40,13 +40,16 @@ ro.qualcomm.bluetooth.hfp=false
 ro.qualcomm.bluetooth.pbap=true
 ro.qualcomm.bluetooth.map=true
 
-
 # Camera
 persist.camera.gyro.disable=0
-persist.camera.imglib.fddsp=1
+persist.camera.imglib.fddsp=0
 
 # CNE
-persist.vendor.cne.feature=1
+#persist.vendor.cne.feature=1
+
+# Keystore Gatekeeper
+ro.hardware.keystore=mdfpp
+ro.hardware.gatekeeper=mdfpp
 
 # Data modules
 persist.data.iwlan.enable=true
@@ -81,6 +84,12 @@ sdm.perf_hint_window=50
 ro.sf.lcd_density=320
 lockscreen.rot_override=true
 
+# Surfaceflinger
+debug.sf.early_phase_offset_ns=1500000
+debug.sf.early_app_phase_offset_ns=1500000
+debug.sf.early_gl_phase_offset_ns=3000000
+debug.sf.early_gl_app_phase_offset_ns=15000000
+
 # IMS
 persist.dbg.volte_avail_ovr=1
 persist.dbg.vt_avail_ovr=1
@@ -138,5 +147,10 @@ persist.data.df.dev_name=rmnet_usb0
 # TimeService
 persist.timed.enable=true
 
+# USB
+sys.usb.controller=6a00000.dwc3
+sys.usb.rndis.func.name=rndis_bam
+sys.usb.rmnet.func.name=rmnet_bam
+
 # Wifi
 wifi.interface=wlan0

vendorsetup.sh

@@ -1 +0,0 @@
-add_lunch_combo lineage_gts3llte-userdebug

vndk/Android.mk

@@ -1,6 +1,18 @@
+ifeq ($(BOARD_VNDK_VERSION),)
+$(warning ************* BOARD VNDK is not enabled - compiling vndk-sp ***************************)
 LOCAL_PATH := $(call my-dir)
 
-include $(LOCAL_PATH)/vndk-sp-libs.mk
+ifndef BOARD_VNDK_VERSION
+
+VNDK_SP_LIBRARIES := \
+    libdexfile \
+    libartbase \
+    libunwind \
+    libunwindstack \
+    libziparchive
+
+install_in_hw_dir := \
+   android.hidl.memory@1.0-impl
 
 vndk_sp_dir := vndk-sp-$(PLATFORM_VNDK_VERSION)
 
@@ -8,7 +20,7 @@ define define-vndk-sp-lib
 include $$(CLEAR_VARS)
 LOCAL_MODULE := $1.vndk-sp-gen
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so
+LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,,)/$1.so
 LOCAL_STRIP_MODULE := false
 LOCAL_MULTILIB := first
 LOCAL_MODULE_TAGS := optional
@@ -22,7 +34,7 @@ ifneq ($$(TARGET_TRANSLATE_2ND_ARCH),true)
 include $$(CLEAR_VARS)
 LOCAL_MODULE := $1.vndk-sp-gen
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PREBUILT_MODULE_FILE := $$($$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so
+LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,$$(TARGET_2ND_ARCH_VAR_PREFIX),)/$1.so
 LOCAL_STRIP_MODULE := false
 LOCAL_MULTILIB := 32
 LOCAL_MODULE_TAGS := optional
@@ -34,20 +46,25 @@ endif # TARGET_TRANSLATE_2ND_ARCH is not true
 endif # TARGET_2ND_ARCH is not empty
 endef
 
+# Add VNDK-SP libs to the list if they are missing
+$(foreach lib,$(VNDK_SAMEPROCESS_LIBRARIES),\
+    $(if $(filter $(lib),$(VNDK_SP_LIBRARIES)),,\
+    $(eval VNDK_SP_LIBRARIES += $(lib))))
+
+# Remove libz from the VNDK-SP list (b/73296261)
+VNDK_SP_LIBRARIES := $(filter-out libz,$(VNDK_SP_LIBRARIES))
+
 $(foreach lib,$(VNDK_SP_LIBRARIES),\
     $(eval $(call define-vndk-sp-lib,$(lib))))
-$(foreach lib,$(EXTRA_VENDOR_LIBRARIES),\
+
-    $(eval $(call define-vndk-lib,$(lib),vndk-ext-gen,,true)))
+install_in_hw_dir :=
-$(foreach lib,$(HW_VENDOR_LIBRARIES),\
-    $(eval $(call define-vndk-lib,$(lib),vndk-hw-gen,hw,true)))
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := vndk-sp
+LOCAL_MODULE_OWNER := google
 LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := \
+LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES))
-    $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) \
-    $(addsuffix .vndk-ext-gen,$(EXTRA_VENDOR_LIBRARIES)) \
-    $(addsuffix .vndk-hw-gen,$(HW_VENDOR_LIBRARIES))
 include $(BUILD_PHONY_PACKAGE)
-
 vndk_sp_dir :=
+endif
+endif

vndk/vndk-sp-libs.mk

@@ -1,70 +0,0 @@
-VNDK_SP_LIBRARIES := \
-    android.hardware.camera.device@1.0 \
-    android.hardware.camera.provider@2.4-impl \
-    android.hardware.camera.provider@2.4 \
-    android.hardware.graphics.allocator@2.0 \
-    android.hardware.graphics.mapper@2.0 \
-    android.hardware.graphics.mapper@2.1 \
-    android.hardware.graphics.common@1.0 \
-    android.hardware.graphics.common@1.1 \
-    android.hardware.renderscript@1.0 \
-    android.hidl.memory@1.0 \
-    libRSCpuRef \
-    libRSDriver \
-    libRS_internal \
-    libbacktrace \
-    libbase \
-    libbcinfo \
-    libblas \
-    libc++ \
-    libcompiler_rt \
-    libcutils \
-    libft2 \
-    libhardware \
-    libhidlbase \
-    libhidlmemory \
-    libhidltransport \
-    libhwbinder \
-    libion \
-    liblzma \
-    libpng \
-    libunwind \
-    libunwindstack \
-    libutils \
-    libutilscallstack \
-    libdexfile \
-    libz
-
-EXTRA_VENDOR_LIBRARIES := \
-    android.hidl.base@1.0 \
-    android.hidl.manager@1.0 \
-    android.hardware.camera.device@1.0 \
-    android.hardware.camera.device@3.2 \
-    android.hardware.camera.device@3.3 \
-    android.hardware.camera.provider@2.4 \
-    libcamera_metadata \
-    libfmq \
-    android.hardware.camera.common@1.0 \
-    android.hardware.configstore@1.0 \
-    android.hardware.configstore-utils \
-    android.hidl.allocator@1.0 \
-    android.hidl.memory@1.0 \
-    libbinder \
-    libui
-
-HW_VENDOR_LIBRARIES := \
-    android.hidl.base@1.0 \
-    android.hidl.manager@1.0 \
-    android.hardware.camera.device@1.0 \
-    android.hardware.camera.device@3.2 \
-    android.hardware.camera.device@3.3 \
-    android.hardware.camera.provider@2.4 \
-    libcamera_metadata \
-    libfmq \
-    android.hardware.camera.common@1.0 \
-    android.hardware.configstore@1.0 \
-    android.hardware.configstore-utils \
-    android.hidl.allocator@1.0 \
-    android.hidl.memory@1.0 \
-    libbinder \
-    libui

wifi/WCNSS_qcom_cfg.ini

@@ -501,6 +501,11 @@ gActiveBpfMode=1
 # 1=Enable (default), 0=Disable
 gEnableMCCAdaptiveScheduler=1
 
+#Skip DFS Channel in case of P2P Search
+# 0 - disable (Scan DFS Channel in P2P Search)
+# 1 - enable (Skip DFS Channel)
+gSkipDfsChannelInP2pSearch=0
+
 #Enable or Disable p2p device address administered
 isP2pDeviceAddrAdministrated=1
 

wifi/wpa_supplicant_overlay.conf

@@ -1,3 +1,8 @@
 disable_scan_offload=1
 p2p_disabled=1
 tdls_external_control=1
+bss_max_count=512
+interworking=1
+hs20=1
+auto_interworking=0
+bss_no_flush_when_down=1