enchilada:I'm OnePlus 6

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index bdb9a5b13b22918a401158e2208b036c81a306cb..15d5427490b27e2ff7b0d2fbf57700a58cc13b6e 100644 (file)
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -25,6 +25,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter dumpling,$(TARGET_DEVICE)),)
+ifneq ($(filter enchilada,$(TARGET_DEVICE)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index cf7e6d3732b1a0e9f42c758b0991067a131f797e..7d6412b4eb553550982ed75e196338be8f73aa35 100644 (file)
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/omni_dumpling.mk
+    $(LOCAL_DIR)/omni_enchilada.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index f1ae5d82336eb66a9282dacf4ebf18a53ce4c693..3d530f6347ce63af40f8f72ea94743b35e759e57 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -40,39 +40,33 @@ ENABLE_CPUSETS := true
 ENABLE_SCHEDBOOST := true
 
 # Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := msm8998
+TARGET_BOOTLOADER_BOARD_NAME := sdm845
 TARGET_NO_BOOTLOADER := true
 TARGET_USES_UEFI := true
 
-# Crypto
-TARGET_HW_DISK_ENCRYPTION := true
-
 # Kernel
-BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x237 ehci-hcd.park=3
-BOARD_KERNEL_CMDLINE += lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 
-BOARD_KERNEL_CMDLINE += service_locator.enable=1 swiotlb=2048 androidboot.usbcontroller=a800000.dwc3
-BOARD_KERNEL_CMDLINE += androidboot.configfs=true
+BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom androidboot.console=ttyMSM0 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 service_locator.enable=1 swiotlb=2048 androidboot.configfs=true androidboot.usbcontroller=a600000.dwc3
 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 BOARD_KERNEL_BASE := 0x00000000
 BOARD_KERNEL_PAGESIZE := 4096
-BOARD_KERNEL_TAGS_OFFSET := 0x01E00000
-BOARD_RAMDISK_OFFSET     := 0x02000000
-TARGET_PREBUILT_KERNEL := device/oneplus/dumpling/prebuilt/Image.gz-dtb
+BOARD_HASH_TYPE := sha1
+BOARD_KERNEL_TAGS_OFFSET := 0x00000100
+BOARD_RAMDISK_OFFSET := 0x01000000
+TARGET_PREBUILT_KERNEL := device/oneplus/enchilada/prebuilt/Image.gz-dtb
 
 # Platform
-TARGET_BOARD_PLATFORM := msm8998
-TARGET_BOARD_PLATFORM_GPU := qcom-adreno540
+TARGET_BOARD_PLATFORM := sdm845
+TARGET_BOARD_PLATFORM_GPU := qcom-adreno630
 
 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
 
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
-BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 56908316672
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2998927360
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 54132453376
 BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
-
+BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824
 TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
 
@@ -84,6 +78,10 @@ TARGET_COPY_OUT_VENDOR := vendor
 BOARD_HAS_LARGE_FILESYSTEM := true
 BOARD_HAS_NO_SELECT_BUTTON := true
 TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
+#bootable/recovery/minuitwrp/graphics_drm.cpp
+#if defined(RECOVERY_RGBX)
+#format = DRM_FORMAT_XBGR8888;
+#base_format = GGL_PIXEL_FORMAT_RGBX_8888;
 
 # TWRP specific build flags
 BOARD_HAS_NO_REAL_SDCARD := true
@@ -93,8 +91,15 @@ TW_BRIGHTNESS_PATH := "/sys/class/leds/lcd-backlight/brightness"
 TW_EXCLUDE_DEFAULT_USB_INIT := true
 TW_EXCLUDE_SUPERSU := true
 TW_EXTRA_LANGUAGES := true
-TW_INCLUDE_CRYPTO := true
 TW_INCLUDE_NTFS_3G := true
+AB_OTA_UPDATER := true
 TW_INPUT_BLACKLIST := "hbtp_vm"
 TW_MAX_BRIGHTNESS := 255
 TW_THEME := portrait_hdpi
+TW_NO_SCREEN_TIMEOUT := true
+
+# Encryption
+PLATFORM_SECURITY_PATCH := 2018-05-01
+TW_INCLUDE_CRYPTO := true
+TARGET_HW_DISK_ENCRYPTION := true
+TW_INCLUDE_FBE := true

diff --git a/README.md b/README.md
deleted file mode 100644 (file)
index 43f036d..0000000
--- a/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# android_device_oneplus_dumpling
-Tree for building TWRP for OnePlus 5T
-
-## Kernel Sources
-
-https://github.com/lineageos/android_kernel_oneplus_msm8998/tree/lineage-15.1
-
-## To compile
-
-export ALLOW_MISSING_DEPENDENCIES=true
-
-. build/envsetup.sh && lunch omni_dumpling-eng
-
-mka adbd recoveryimage
-
-## Device specifications
-
-| Device       | OnePlus 5T                                      |
-| -----------: | :---------------------------------------------- |
-| SoC          | Qualcomm MSM8998 Snapdragon 835                 |
-| CPU          | Quad-core 2.45GHz Kryo & quad-core 1.9GHz Kryo  |
-| GPU          | 710MHz Adreno 540                               |
-| Memory       | 6GB / 8GM RAM (LPDDR4X)                         |
-| Shipped Android version | 7.1.1                                |
-| Storage      | 64GB / 128GB (UFS 2.1 2-LANE Flash)             |
-| Battery      | Non-removable Li-Po 3300 mAh                    |
-| Dimensions   | 152.7 x 74.1 x 7.25 mm                          |
-| Display      | 2160 x 1080 (18:9), 6 inch                      |
-| Rear camera 1 | 16MP (IMX 398), 1.12-micron pixels, f/1.7 Dual LED flash, 4K 30 fps, 1080p 60 fps, 720p 120 fps video |
-| Rear camera 2 | 20MP (IMX 376k), 1-micron pixels, f/1.7        |
-| Front camera | 16MP (IMX 371), 1-micron pixels, f/2.0 1080p 30 fps video |
-
-## Device picture
-
-![OnePlus 5T](https://image01.oneplus.net/shop/201711/16/1850/c2baf281695709898707dd551a05274c_260_0.png "OnePlus 5T in black")

diff --git a/omni_dumpling.mk b/omni_dumpling.mk
deleted file mode 100644 (file)
index e9bc509..0000000
--- a/omni_dumpling.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2017 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.
-#
-
-# Release name
-PRODUCT_RELEASE_NAME := dumpling
-
-$(call inherit-product, build/target/product/embedded.mk)
-
-# Inherit from our custom product configuration
-$(call inherit-product, vendor/omni/config/common.mk)
-
-## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := dumpling
-PRODUCT_NAME := omni_dumpling
-PRODUCT_BRAND := OnePlus
-PRODUCT_MODEL := OnePlus A5010
-PRODUCT_MANUFACTURER := OnePlus

diff --git a/omni_enchilada.mk b/omni_enchilada.mk
new file mode 100644 (file)
index 0000000..71f3ee1
--- /dev/null
+++ b/omni_enchilada.mk
@@ -0,0 +1,30 @@
+#
+# Copyright 2017 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.
+#
+
+# Release name
+PRODUCT_RELEASE_NAME := enchilada
+
+$(call inherit-product, build/target/product/embedded.mk)
+
+# Inherit from our custom product configuration
+$(call inherit-product, vendor/omni/config/common.mk)
+
+## Device identifier. This must come after all inclusions
+PRODUCT_DEVICE := enchilada
+PRODUCT_NAME := omni_enchilada
+PRODUCT_BRAND := OnePlus
+PRODUCT_MODEL := OnePlus A6000
+PRODUCT_MANUFACTURER := OnePlus

diff --git a/prebuilt/Image.gz-dtb b/prebuilt/Image.gz-dtb
index c10f762bc1b05bfc307b4fb00e6a4da1947547b0..8fde9912078584241b650964cb3fae57e751a392 100644 (file)
Binary files a/prebuilt/Image.gz-dtb and b/prebuilt/Image.gz-dtb differ

diff --git a/recovery.fstab b/recovery.fstab
index d662a26e9a0fdbfafd6e07feafed654c57544767..676a144fb00245be674dfbc365ed562d2be5d15f 100644 (file)
--- a/recovery.fstab
+++ b/recovery.fstab
@@ -1,15 +1,15 @@
 # mount point  fstype  device                                  device2                         flags
-/boot          emmc    /dev/block/bootdevice/by-name/boot
-/cache         ext4    /dev/block/bootdevice/by-name/cache
-/recovery      emmc    /dev/block/bootdevice/by-name/recovery                                  flags=backup=1
-/system                ext4    /dev/block/bootdevice/by-name/system
-/system_image  emmc    /dev/block/bootdevice/by-name/system
-/data          ext4    /dev/block/bootdevice/by-name/userdata
-/firmware      vfat    /dev/block/bootdevice/by-name/modem                                     flags=display="Firmware";mounttodecrypt;fsflags=ro
+/boot          emmc    /dev/block/bootdevice/by-name/boot                                      flags=slotselect
+/system                ext4    /dev/block/bootdevice/by-name/system                                    flags=slotselect
+/system_image  emmc    /dev/block/bootdevice/by-name/system                                    flags=slotselect
+/vendor                ext4    /dev/block/bootdevice/by-name/vendor                                    flags=slotselect;display="Vendor";backup=1
+/vendor_image  emmc    /dev/block/bootdevice/by-name/vendor                                    flags=slotselect
+/data          ext4    /dev/block/bootdevice/by-name/userdata                                  flags=encryptable=footer
+/firmware      vfat    /dev/block/bootdevice/by-name/modem                                     flags=slotselect;display="Firmware";mounttodecrypt;fsflags=ro
 /misc          emmc    /dev/block/bootdevice/by-name/misc
-/modem         emmc    /dev/block/bootdevice/by-name/modem                                     flags=backup=1;display="Modem"
-/bluetooth     emmc    /dev/block/bootdevice/by-name/bluetooth                                 flags=backup=1;subpartitionof=/modem
-/dsp           emmc    /dev/block/bootdevice/by-name/dsp                                       flags=backup=1;subpartitionof=/modem
+/modem         emmc    /dev/block/bootdevice/by-name/modem                                     flags=slotselect;backup=1;display="Modem"
+/bluetooth     emmc    /dev/block/bootdevice/by-name/bluetooth                                 flags=slotselect;backup=1;subpartitionof=/modem
+/dsp           emmc    /dev/block/bootdevice/by-name/dsp                                       flags=slotselect;backup=1;subpartitionof=/modem
 /efs1          emmc    /dev/block/bootdevice/by-name/modemst1                                  flags=backup=1;display=EFS
 /efs2          emmc    /dev/block/bootdevice/by-name/modemst2                                  flags=backup=1;subpartitionof=/efs1
 /efsc          emmc    /dev/block/bootdevice/by-name/fsc                                       flags=backup=1;subpartitionof=/efs1

diff --git a/recovery/root/init.recovery.qcom.rc b/recovery/root/init.recovery.qcom.rc
index c5c55c6bca3aafbfd8b68da807030787090837a7..9558c906198dce1066c96202e88a0681c600cc5e 100644 (file)
--- a/recovery/root/init.recovery.qcom.rc
+++ b/recovery/root/init.recovery.qcom.rc
@@ -25,44 +25,34 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-on early-init
-    mkdir /firmware 0771 system system
-
 on fs
-    wait /dev/block/platform/soc/1da4000.ufshc
-    symlink /dev/block/platform/soc/1da4000.ufshc /dev/block/bootdevice
+    wait /dev/block/platform/soc/${ro.boot.bootdevice}
+    symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
     chmod 0660 /dev/qseecom
     chown system drmrpc /dev/qseecom
     chmod 0664 /dev/ion
     chown system system /dev/ion
     install_keyring
-
-    # Mount firmware
-    mount vfat /dev/block/bootdevice/by-name/modem /firmware ro shortname=lower uid=1000 gid=1000 dmask=227 fmask=337
-
-    # Only needed when we don't include all required blobs for crypto
-    #start prepdecrypt
     setprop crypto.ready 1
 
-service prepdecrypt /sbin/prepdecrypt.sh
-    oneshot
+# Separate copy needed to use /sbin/linker64 instead of /system/bin/linker64
+service sbinqseecomd /sbin/qseecomd
     user root
     group root
     disabled
     seclabel u:r:recovery:s0
 
-# Separate copy needed to use /sbin/linker64 instead of /system/bin/linker64
-service sbinqseecomd /sbin/qseecomd
+service hwservicemanager /sbin/hwservicemanager
     user root
     group root
     disabled
+    onrestart setprop hwservicemanager.ready false
     seclabel u:r:recovery:s0
 
-service hwservicemanager /sbin/hwservicemanager
+service boot-1-0 /sbin/android.hardware.boot@1.0-service
     user root
     group root
     disabled
-    onrestart setprop hwservicemanager.ready false
     seclabel u:r:recovery:s0
 
 service servicemanager /sbin/servicemanager
@@ -78,45 +68,43 @@ service keystore_auth /sbin/keystore_auth
     disabled
     seclabel u:r:recovery:s0
 
-service keystore /sbin/keystore /data/misc/keystore
+# keystore is started and stopped on demand by TWRP
+service keystore /sbin/keystore /tmp/misc/keystore
     user root
     group root drmrpc readproc
     disabled
     seclabel u:r:recovery:s0
 
-service gatekeeper-1-0 /sbin/android.hardware.gatekeeper@1.0-service
+service gatekeeper-1-0 /sbin/android.hardware.gatekeeper@1.0-service-qti
     user root
     group root
     disabled
     seclabel u:r:recovery:s0
 
-service keymaster-3-0 /sbin/android.hardware.keymaster@3.0-service
+service keymaster-3-0 /sbin/android.hardware.keymaster@3.0-service-qti
     user root
     group root
     disabled
     seclabel u:r:recovery:s0
 
 on boot
-    # Workaround for adb not coming up
-    setprop sys.usb.config mtp,adb
-    setprop sys.usb.config adb
-    
-    # Enable OTG
-    write /sys/devices/soc/800f000.qcom,spmi/spmi-0/spmi0-02/800f000.qcom,spmi:qcom,pmi8998@2:qcom,qpnp-smb2/power_supply/usb/otg_switch 1
+    write /proc/touchpanel/gesture_enable 1
+    write /sys/devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pmi8998@2:qcom,qpnp-smb2/power_supply/usb/otg_switch 1
+
+on init
+    start hwservicemanager
+    start boot-1-0
 
 on property:crypto.ready=0
     stop sbinqseecomd
     stop keymaster-3-0
     stop gatekeeper-1-0
-    stop hwservicemanager
-    stop keystore
     stop servicemanager
 
 on property:crypto.ready=1
     start sbinqseecomd
 
 on property:sys.listeners.registered=true
-    start hwservicemanager
     start keymaster-3-0
     start gatekeeper-1-0
     start servicemanager

diff --git a/recovery/root/init.recovery.usb.rc b/recovery/root/init.recovery.usb.rc
index f64186e6385d539575e5773e0d809f04d8bf589e..01c6b76b550374a5158bf97e4b9ae2564c68fbd7 100644 (file)
--- a/recovery/root/init.recovery.usb.rc
+++ b/recovery/root/init.recovery.usb.rc
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
+# Copyright (c) 2011-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:
@@ -26,6 +26,7 @@
 #
 
 on boot
+    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
     mkdir /dev/usb-ffs 0770 shell shell
     mkdir /dev/usb-ffs/adb 0770 shell shell
     mount configfs none /config
@@ -40,22 +41,26 @@ on boot
     mkdir /config/usb_gadget/g1/functions/mtp.gs0
     mkdir /config/usb_gadget/g1/functions/ptp.gs1
     mkdir /config/usb_gadget/g1/functions/accessory.gs2
-    mkdir /config/usb_gadget/g1/functions/audio_source.gs2
     mkdir /config/usb_gadget/g1/functions/audio_source.gs3
     mkdir /config/usb_gadget/g1/functions/midi.gs5
     mkdir /config/usb_gadget/g1/functions/ffs.adb
     mkdir /config/usb_gadget/g1/functions/diag.diag
+    mkdir /config/usb_gadget/g1/functions/diag.diag_mdm
     mkdir /config/usb_gadget/g1/functions/cser.dun.0
     mkdir /config/usb_gadget/g1/functions/cser.nmea.1
+    mkdir /config/usb_gadget/g1/functions/cser.dun.2
     mkdir /config/usb_gadget/g1/functions/gsi.rmnet
     mkdir /config/usb_gadget/g1/functions/gsi.rndis
     mkdir /config/usb_gadget/g1/functions/gsi.dpl
     mkdir /config/usb_gadget/g1/functions/qdss.qdss
+    mkdir /config/usb_gadget/g1/functions/qdss.qdss_mdm
     mkdir /config/usb_gadget/g1/functions/rndis_bam.rndis
     mkdir /config/usb_gadget/g1/functions/rmnet_bam.rmnet
     mkdir /config/usb_gadget/g1/functions/rmnet_bam.dpl
     mkdir /config/usb_gadget/g1/functions/ncm.0
     mkdir /config/usb_gadget/g1/functions/ccid.ccid
+    mkdir /config/usb_gadget/g1/functions/uac2.0
+    mkdir /config/usb_gadget/g1/functions/uvc.0
     mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell
     mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell
     write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1
@@ -68,9 +73,16 @@ on property:sys.usb.config=none
     write /config/usb_gadget/g1/UDC "none"
     stop adbd
     setprop sys.usb.ffs.ready 0
+    setprop sys.usb.ffs.mtp.ready 0
     write /config/usb_gadget/g1/bDeviceClass 0
     write /config/usb_gadget/g1/bDeviceSubClass 0
     write /config/usb_gadget/g1/bDeviceProtocol 0
+    rm /config/usb_gadget/g1/configs/b.1/f1
+    rm /config/usb_gadget/g1/configs/b.1/f2
+    rm /config/usb_gadget/g1/configs/b.1/f3
+    rm /config/usb_gadget/g1/configs/b.1/f4
+    rm /config/usb_gadget/g1/configs/b.1/f5
+    rmdir /config/usb_gadget/g1/functions/rndis.gs4
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=adb
@@ -83,7 +95,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=adb
     rm /config/usb_gadget/g1/configs/b.1/f3
     rm /config/usb_gadget/g1/configs/b.1/f4
     rm /config/usb_gadget/g1/configs/b.1/f5
-    write /config/usb_gadget/g1/idVendor 0x18d1
+    write /config/usb_gadget/g1/idVendor 0x2A70
     write /config/usb_gadget/g1/idProduct 0x4ee7
     symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
     write /config/usb_gadget/g1/UDC ${sys.usb.controller}
@@ -96,8 +108,8 @@ on property:sys.usb.config=mtp
     rm /config/usb_gadget/g1/configs/b.1/f3
     rm /config/usb_gadget/g1/configs/b.1/f4
     rm /config/usb_gadget/g1/configs/b.1/f5
-    write /config/usb_gadget/g1/idVendor 0x2717
-    write /config/usb_gadget/g1/idProduct 0xff40
+    write /config/usb_gadget/g1/idVendor 0x2A70
+    write /config/usb_gadget/g1/idProduct 0XF003
     symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1
     write /config/usb_gadget/g1/UDC ${sys.usb.controller}
     setprop sys.usb.state ${sys.usb.config}
@@ -112,9 +124,13 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,adb
     rm /config/usb_gadget/g1/configs/b.1/f3
     rm /config/usb_gadget/g1/configs/b.1/f4
     rm /config/usb_gadget/g1/configs/b.1/f5
-    write /config/usb_gadget/g1/idVendor 0x2717
-    write /config/usb_gadget/g1/idProduct 0xff48
+    write /config/usb_gadget/g1/idVendor 0x2A70
+    write /config/usb_gadget/g1/idProduct 0x9011
     symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1
     symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
     write /config/usb_gadget/g1/UDC ${sys.usb.controller}
     setprop sys.usb.state ${sys.usb.config}
+
+on property:ro.boot.usbcontroller=*
+    setprop sys.usb.controller ${ro.boot.usbcontroller}
+

diff --git a/recovery/root/sbin/android.hardware.boot@1.0-service b/recovery/root/sbin/android.hardware.boot@1.0-service
new file mode 100644 (file)
index 0000000..a9b918d
Binary files /dev/null and b/recovery/root/sbin/android.hardware.boot@1.0-service differ

diff --git a/recovery/root/sbin/android.hardware.boot@1.0.so b/recovery/root/sbin/android.hardware.boot@1.0.so
new file mode 100644 (file)
index 0000000..096f604
Binary files /dev/null and b/recovery/root/sbin/android.hardware.boot@1.0.so differ

diff --git a/recovery/root/sbin/android.hardware.gatekeeper@1.0-service b/recovery/root/sbin/android.hardware.gatekeeper@1.0-service
deleted file mode 100755 (executable)
index 8cf08ff..0000000
Binary files a/recovery/root/sbin/android.hardware.gatekeeper@1.0-service and /dev/null differ

diff --git a/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti b/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti
new file mode 100644 (file)
index 0000000..eb88d01
Binary files /dev/null and b/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti differ

diff --git a/recovery/root/sbin/android.hardware.keymaster@3.0-service b/recovery/root/sbin/android.hardware.keymaster@3.0-service
deleted file mode 100755 (executable)
index d697540..0000000
Binary files a/recovery/root/sbin/android.hardware.keymaster@3.0-service and /dev/null differ

diff --git a/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti b/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti
new file mode 100644 (file)
index 0000000..ed0fe3c
Binary files /dev/null and b/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti differ

diff --git a/recovery/root/sbin/android.hidl.base@1.0.so b/recovery/root/sbin/android.hidl.base@1.0.so
old mode 100755 (executable)
new mode 100644 (file)
index 21a6ed7..1f78ccf
Binary files a/recovery/root/sbin/android.hidl.base@1.0.so and b/recovery/root/sbin/android.hidl.base@1.0.so differ

diff --git a/recovery/root/sbin/prepdecrypt.sh b/recovery/root/sbin/prepdecrypt.sh
deleted file mode 100644 (file)
index 6b84894..0000000
--- a/recovery/root/sbin/prepdecrypt.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/sbin/sh
-
-relink()
-{
-       fname=$(basename "$1")
-       target="/sbin/$fname"
-       sed 's|/system/bin/linker64|///////sbin/linker64|' "$1" > "$target"
-       chmod 755 $target
-}
-
-mkdir /s
-mount -t ext4 -o ro /dev/block/bootdevice/by-name/system /s
-
-if [ -f /s/build.prop ]; then
-       osver=$(grep -i 'ro.build.version.release' /s/build.prop  | cut -f2 -d'=')
-       patchlevel=$(grep -i 'ro.build.version.security_patch' /s/build.prop  | cut -f2 -d'=')
-       setprop ro.build.version.release "$osver"
-       setprop ro.build.version.security_patch "$patchlevel"
-fi
-
-mkdir -p /vendor/lib64/hw/
-
-relink /s/xbin/strace
-
-cp /s/lib64/android.hidl.base@1.0.so /sbin/
-
-relink /s/vendor/bin/qseecomd
-
-cp /s/vendor/lib64/libdiag.so /vendor/lib64/
-cp /s/vendor/lib64/libdrmfs.so /vendor/lib64/
-cp /s/vendor/lib64/libdrmtime.so /vendor/lib64/
-cp /s/vendor/lib64/libGPreqcancel.so /vendor/lib64/
-cp /s/vendor/lib64/libGPreqcancel_svc.so /vendor/lib64/
-cp /s/vendor/lib64/libqisl.so /vendor/lib64/
-cp /s/vendor/lib64/libQSEEComAPI.so /vendor/lib64/
-cp /s/vendor/lib64/librpmb.so /vendor/lib64/
-cp /s/vendor/lib64/libsecureui.so /vendor/lib64/
-cp /s/vendor/lib64/libSecureUILib.so /vendor/lib64/
-cp /s/vendor/lib64/libsecureui_svcsock.so /vendor/lib64/
-cp /s/vendor/lib64/libspl.so /vendor/lib64/
-cp /s/vendor/lib64/libssd.so /vendor/lib64/
-cp /s/vendor/lib64/libStDrvInt.so /vendor/lib64/
-cp /s/vendor/lib64/libtime_genoff.so /vendor/lib64/
-cp /s/vendor/lib64/libkeymasterdeviceutils.so /vendor/lib64/
-cp /s/vendor/lib64/libkeymasterprovision.so /vendor/lib64/
-cp /s/vendor/lib64/libkeymasterutils.so /vendor/lib64/
-cp /s/vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so /vendor/lib64/
-cp /s/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl.so /vendor/lib64/hw/
-cp /s/vendor/lib64/hw/android.hardware.keymaster@3.0-impl.so /vendor/lib64/hw/
-cp /s/vendor/lib64/hw/gatekeeper.msm8998.so /vendor/lib64/hw/
-cp /s/vendor/lib64/hw/keystore.msm8998.so /vendor/lib64/hw/
-
-cp /s/vendor/manifest.xml /vendor/
-cp /s/vendor/compatibility_matrix.xml /vendor/
-
-relink /s/vendor/bin/hw/android.hardware.gatekeeper@1.0-service
-relink /s/vendor/bin/hw/android.hardware.keymaster@3.0-service
-
-umount /s
-
-setprop crypto.ready 1
-exit 0

diff --git a/recovery/root/sbin/qseecomd b/recovery/root/sbin/qseecomd
index 9c22507cf5ae07623e935e2274ac7e2333ad9693..0136ea50518b7e244b07e4a15cf378d4bebddf4f 100755 (executable)
Binary files a/recovery/root/sbin/qseecomd and b/recovery/root/sbin/qseecomd differ

diff --git a/recovery/root/ueventd.qcom.rc b/recovery/root/ueventd.qcom.rc
index 43bc44525df7b43e09e075496c196a1d3a90be05..36b347dc996686123a7e9606fadc5f3bce31ccfc 100644 (file)
--- a/recovery/root/ueventd.qcom.rc
+++ b/recovery/root/ueventd.qcom.rc
@@ -118,6 +118,7 @@
 /dev/media*               0660   system     camera
 /dev/v4l-subdev*          0660   system     camera
 /dev/qseecom              0660   system     drmrpc
+/dev/qce                  0660   system     drmrpc
 /dev/smcinvoke            0660   system     system
 /dev/qsee_ipc_irq_spss    0660   system     drmrpc
 /dev/seemplog             0660   system     system
@@ -232,6 +233,10 @@
 /sys/devices/soc/78b7000.i2c/i2c-3/3-004b/input/input*    secure_touch_enable  0660   system  drmrpc
 /sys/devices/soc/c179000.i2c/i2c-5/5-0020/input/input*    secure_touch         0440   system  drmrpc
 /sys/devices/soc/c179000.i2c/i2c-5/5-0020/input/input*    secure_touch_enable  0660   system  drmrpc
+/sys/devices/platform/soc/a98000.i2c/i2c-2/2-0020/input/input*  secure_touch          0440 system drmrpc
+/sys/devices/platform/soc/a98000.i2c/i2c-2/2-0020/input/input*  secure_touch_enable   0660 system drmrpc
+/sys/devices/platform/soc/a84000.i2c/i2c-2/2-0020/input/input*  secure_touch          0440 system drmrpc
+/sys/devices/platform/soc/a84000.i2c/i2c-2/2-0020/input/input*  secure_touch_enable   0660 system drmrpc
 
 # laser sensor access
 /sys/devices/virtual/input/input*                   enable_ps_sensor 0660  system   input
@@ -251,6 +256,7 @@
 # wigig
 /sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/fst_link_loss 0660 wifi wifi
 /sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/thermal_throttling 0660 system system
+/sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/snr_thresh 0660 wifi wifi
 /sys/bus/pci/drivers/wil6210* 0000:01:00.0/net/wigig0/queues/rx-0/rps_cpus 0660 system system
 /sys/bus/pci/drivers/wil6210* 0000:01:00.0/net/wigig0/gro_flush_timeout 0660 system system
 /sys/devices/virtual/net/bond0 queues/rx-0/rps_cpus 0660 system system
@@ -288,6 +294,7 @@
 /dev/block/platform/soc/1da4000.ufshc/by-name/frp       0600   system     system
 /dev/block/platform/soc/c0c4000.sdhci/by-name/frp       0600   system     system
 /dev/block/platform/soc/1d84000.ufshc/by-name/frp       0600   system     system
+/dev/block/platform/soc/7c4000.sdhci/by-name/frp        0600   system     system
 
 # Kmsg device
 /dev/kmsg                                               0620   root       system

diff --git a/recovery/root/vendor/lib64/hw/android.hardware.boot@1.0-impl.so b/recovery/root/vendor/lib64/hw/android.hardware.boot@1.0-impl.so
new file mode 100644 (file)
index 0000000..a162f10
Binary files /dev/null and b/recovery/root/vendor/lib64/hw/android.hardware.boot@1.0-impl.so differ

diff --git a/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so b/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
new file mode 100644 (file)
index 0000000..07b4a77
Binary files /dev/null and b/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so differ

diff --git a/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl.so b/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl.so
deleted file mode 100755 (executable)
index fedb441..0000000
Binary files a/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl.so and /dev/null differ

diff --git a/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so b/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so
new file mode 100755 (executable)
index 0000000..802214a
Binary files /dev/null and b/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so differ

diff --git a/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl.so b/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl.so
deleted file mode 100755 (executable)
index b65668c..0000000
Binary files a/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl.so and /dev/null differ

diff --git a/recovery/root/vendor/lib64/hw/bootctrl.sdm845.so b/recovery/root/vendor/lib64/hw/bootctrl.sdm845.so
new file mode 100644 (file)
index 0000000..ed5b570
Binary files /dev/null and b/recovery/root/vendor/lib64/hw/bootctrl.sdm845.so differ

diff --git a/recovery/root/vendor/lib64/hw/gatekeeper.msm8998.so b/recovery/root/vendor/lib64/hw/gatekeeper.msm8998.so
deleted file mode 100644 (file)
index 61fe47f..0000000
Binary files a/recovery/root/vendor/lib64/hw/gatekeeper.msm8998.so and /dev/null differ

diff --git a/recovery/root/vendor/lib64/hw/keystore.msm8998.so b/recovery/root/vendor/lib64/hw/keystore.msm8998.so
deleted file mode 100644 (file)
index 51b6f2d..0000000
Binary files a/recovery/root/vendor/lib64/hw/keystore.msm8998.so and /dev/null differ

diff --git a/recovery/root/vendor/lib64/libGPreqcancel.so b/recovery/root/vendor/lib64/libGPreqcancel.so
index 62fde767c1d79816ddbdf6c11acbfb71be26ed1e..7fb087f9012be89f3f2d12494335295a1e2bf54e 100644 (file)
Binary files a/recovery/root/vendor/lib64/libGPreqcancel.so and b/recovery/root/vendor/lib64/libGPreqcancel.so differ

diff --git a/recovery/root/vendor/lib64/libGPreqcancel_svc.so b/recovery/root/vendor/lib64/libGPreqcancel_svc.so
index ce0063e580835304297480c246a99da394c66aab..9b6f2707af5c0235a50c8371a343a25d77d3e6e4 100644 (file)
Binary files a/recovery/root/vendor/lib64/libGPreqcancel_svc.so and b/recovery/root/vendor/lib64/libGPreqcancel_svc.so differ

diff --git a/recovery/root/vendor/lib64/libQSEEComAPI.so b/recovery/root/vendor/lib64/libQSEEComAPI.so
old mode 100644 (file)
new mode 100755 (executable)
index 63fabbb..f8ebc04
Binary files a/recovery/root/vendor/lib64/libQSEEComAPI.so and b/recovery/root/vendor/lib64/libQSEEComAPI.so differ

diff --git a/recovery/root/vendor/lib64/libSecureUILib.so b/recovery/root/vendor/lib64/libSecureUILib.so
index 80039079380e55e4cf19303d5ee4b327e029892a..d460f92ad69e73ddbb1c43f853ee1549fa0b87c5 100644 (file)
Binary files a/recovery/root/vendor/lib64/libSecureUILib.so and b/recovery/root/vendor/lib64/libSecureUILib.so differ

diff --git a/recovery/root/vendor/lib64/libStDrvInt.so b/recovery/root/vendor/lib64/libStDrvInt.so
index cfa0c19a84ab8a495bbfc6ff80d442308f4ca9a4..51f9769309a5a948bd2dc2612a4cdf9688de5f0e 100644 (file)
Binary files a/recovery/root/vendor/lib64/libStDrvInt.so and b/recovery/root/vendor/lib64/libStDrvInt.so differ

diff --git a/recovery/root/vendor/lib64/libdiag.so b/recovery/root/vendor/lib64/libdiag.so
old mode 100644 (file)
new mode 100755 (executable)
index 491670e..8ac11d9
Binary files a/recovery/root/vendor/lib64/libdiag.so and b/recovery/root/vendor/lib64/libdiag.so differ

diff --git a/recovery/root/vendor/lib64/libdrmfs.so b/recovery/root/vendor/lib64/libdrmfs.so
old mode 100644 (file)
new mode 100755 (executable)
index 27ab939..22dcc8e
Binary files a/recovery/root/vendor/lib64/libdrmfs.so and b/recovery/root/vendor/lib64/libdrmfs.so differ

diff --git a/recovery/root/vendor/lib64/libdrmtime.so b/recovery/root/vendor/lib64/libdrmtime.so
index 4fc834edad5616825b6a8d3a8b0b6b936ae262b6..787b11bbc8708dc3511dab9ef8243bf5eb461d39 100644 (file)
Binary files a/recovery/root/vendor/lib64/libdrmtime.so and b/recovery/root/vendor/lib64/libdrmtime.so differ

diff --git a/recovery/root/vendor/lib64/libicuuc.so b/recovery/root/vendor/lib64/libicuuc.so
new file mode 100755 (executable)
index 0000000..babb335
Binary files /dev/null and b/recovery/root/vendor/lib64/libicuuc.so differ

diff --git a/recovery/root/vendor/lib64/libkeymasterdeviceutils.so b/recovery/root/vendor/lib64/libkeymasterdeviceutils.so
index 39e07cf4a17890a36972c70e859837e02af971f3..496a6aa21b6be9e363b5d85cf0bb9a3df6eff97a 100644 (file)
Binary files a/recovery/root/vendor/lib64/libkeymasterdeviceutils.so and b/recovery/root/vendor/lib64/libkeymasterdeviceutils.so differ

diff --git a/recovery/root/vendor/lib64/libkeymasterprovision.so b/recovery/root/vendor/lib64/libkeymasterprovision.so
index 7fd1904df18dcb4e775fb2a68bacd7ae0f0bf927..0cdde6deb90e30d072ff989206b832720e64c3f9 100644 (file)
Binary files a/recovery/root/vendor/lib64/libkeymasterprovision.so and b/recovery/root/vendor/lib64/libkeymasterprovision.so differ

diff --git a/recovery/root/vendor/lib64/libkeymasterutils.so b/recovery/root/vendor/lib64/libkeymasterutils.so
index 05931f55bcea633528ad9f55efd46fd4d9aba32c..aab5690d3bae25fb409a5182f4e55ebe4c96d461 100644 (file)
Binary files a/recovery/root/vendor/lib64/libkeymasterutils.so and b/recovery/root/vendor/lib64/libkeymasterutils.so differ

diff --git a/recovery/root/vendor/lib64/libqisl.so b/recovery/root/vendor/lib64/libqisl.so
index 0af9129443aeed47fc45dcd3459bf0aded855525..3d9e765feab5ce99ca2d73e389d74341385a4e77 100644 (file)
Binary files a/recovery/root/vendor/lib64/libqisl.so and b/recovery/root/vendor/lib64/libqisl.so differ

diff --git a/recovery/root/vendor/lib64/librecovery_updater_msm.so b/recovery/root/vendor/lib64/librecovery_updater_msm.so
new file mode 100644 (file)
index 0000000..2fe05a2
Binary files /dev/null and b/recovery/root/vendor/lib64/librecovery_updater_msm.so differ

diff --git a/recovery/root/vendor/lib64/librpmb.so b/recovery/root/vendor/lib64/librpmb.so
old mode 100644 (file)
new mode 100755 (executable)
index 085be11..2891ac2
Binary files a/recovery/root/vendor/lib64/librpmb.so and b/recovery/root/vendor/lib64/librpmb.so differ

diff --git a/recovery/root/vendor/lib64/libsecureui.so b/recovery/root/vendor/lib64/libsecureui.so
index ff5d45d3ce771918f1a9515b2de7e140d22e029c..9abd9da021f6dca597c4259dd8b54239d1889fc6 100644 (file)
Binary files a/recovery/root/vendor/lib64/libsecureui.so and b/recovery/root/vendor/lib64/libsecureui.so differ

diff --git a/recovery/root/vendor/lib64/libsecureui_svcsock.so b/recovery/root/vendor/lib64/libsecureui_svcsock.so
index 47679f4cfe9e5bee9192682d512c763d0cbb33ed..94357b6366309f8547da9e5b06d21cdbf5742bf3 100644 (file)
Binary files a/recovery/root/vendor/lib64/libsecureui_svcsock.so and b/recovery/root/vendor/lib64/libsecureui_svcsock.so differ

diff --git a/recovery/root/vendor/lib64/libspcom.so b/recovery/root/vendor/lib64/libspcom.so
new file mode 100644 (file)
index 0000000..757b2c2
Binary files /dev/null and b/recovery/root/vendor/lib64/libspcom.so differ

diff --git a/recovery/root/vendor/lib64/libspl.so b/recovery/root/vendor/lib64/libspl.so
index fbc41779208566a2eb377605c5b22205fda64619..3d61e79e7f687ca0e469f1898ef87fb767f2cb71 100644 (file)
Binary files a/recovery/root/vendor/lib64/libspl.so and b/recovery/root/vendor/lib64/libspl.so differ

diff --git a/recovery/root/vendor/lib64/libssd.so b/recovery/root/vendor/lib64/libssd.so
old mode 100644 (file)
new mode 100755 (executable)
index 418e1ef..b954525
Binary files a/recovery/root/vendor/lib64/libssd.so and b/recovery/root/vendor/lib64/libssd.so differ

diff --git a/recovery/root/vendor/lib64/libtime_genoff.so b/recovery/root/vendor/lib64/libtime_genoff.so
old mode 100755 (executable)
new mode 100644 (file)
index 8c32217..22212ee
Binary files a/recovery/root/vendor/lib64/libtime_genoff.so and b/recovery/root/vendor/lib64/libtime_genoff.so differ

diff --git a/recovery/root/vendor/lib64/libxml2.so b/recovery/root/vendor/lib64/libxml2.so
new file mode 100755 (executable)
index 0000000..f73d58b
Binary files /dev/null and b/recovery/root/vendor/lib64/libxml2.so differ

diff --git a/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so b/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so
index 303b0615b09ce5e750c02355e14fa88b39806bbb..4972c570fc158770e9444d6c53d82ae29823bb94 100644 (file)
Binary files a/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so and b/recovery/root/vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so differ

diff --git a/recovery/root/vendor/manifest.xml b/recovery/root/vendor/manifest.xml
index 3993b26583ced53f2e6d1ecfb472ee649fb75693..06b14cd3b20e31b86b61b108b7a30ce1b6306b4a 100644 (file)
--- a/recovery/root/vendor/manifest.xml
+++ b/recovery/root/vendor/manifest.xml
@@ -5,7 +5,7 @@
         <version>2.0</version>
         <interface>
             <name>IDevicesFactory</name>
-            <instance>msm8998</instance>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -36,17 +36,17 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.broadcastradio</name>
+        <name>android.hardware.boot</name>
         <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
-            <name>IBroadcastRadioFactory</name>
+            <name>IBootControl</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
         <name>android.hardware.camera.provider</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>2.4</version>
         <interface>
             <name>ICameraProvider</name>
@@ -71,6 +71,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.contexthub</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IContexthub</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.drm</name>
         <transport>hwbinder</transport>
@@ -92,7 +101,7 @@
         <version>1.0</version>
         <interface>
             <name>IGatekeeper</name>
-            <instance>msm8998</instance>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -101,7 +110,7 @@
         <version>1.0</version>
         <interface>
             <name>IGnss</name>
-            <instance>msm8998</instance>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -110,7 +119,7 @@
         <version>2.0</version>
         <interface>
             <name>IAllocator</name>
-            <instance>msm8998</instance>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -119,7 +128,7 @@
         <version>2.1</version>
         <interface>
             <name>IComposer</name>
-            <instance>msm8998</instance>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -131,13 +140,22 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.health</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IHealth</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
         <version>3.0</version>
         <interface>
             <name>IKeymasterDevice</name>
-            <instance>msm8998</instance>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -146,7 +164,7 @@
         <version>2.0</version>
         <interface>
             <name>ILight</name>
-            <instance>msm8998</instance>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -168,7 +186,7 @@
         <version>1.0</version>
         <interface>
             <name>IMemtrack</name>
-            <instance>msm8998</instance>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -183,7 +201,7 @@
     <hal format="hidl">
         <name>android.hardware.power</name>
         <transport>hwbinder</transport>
-        <version>1.1</version>
+        <version>1.0</version>
         <interface>
             <name>IPower</name>
             <instance>default</instance>
@@ -229,7 +247,16 @@
         <version>1.0</version>
         <interface>
             <name>ISensors</name>
-            <instance>msm8998</instance>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.soundtrigger</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>ISoundTriggerHw</name>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -256,7 +283,7 @@
         <version>1.0</version>
         <interface>
             <name>IThermal</name>
-            <instance>msm8998</instance>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -304,6 +331,57 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>com.fingerprints.extension</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IFingerprintAuthenticator</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IFingerprintCalibration</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IFingerprintEngineering</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IFingerprintNavigation</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IFingerprintRecalibration</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IFingerprintSenseTouch</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IFingerprintSensorTest</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>com.qualcomm.qti.ant</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IAntHci</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>com.qualcomm.qti.bluetooth_audio</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothAudio</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>com.qualcomm.qti.dpm.api</name>
         <transport>hwbinder</transport>
@@ -383,7 +461,7 @@
     <hal format="hidl">
         <name>vendor.display.config</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>IDisplayConfig</name>
             <instance>default</instance>
@@ -398,6 +476,24 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.nxp.hardware.nfc</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>INqNfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.oneplus.hardware.wifi</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IOneplusWifi</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.esepowermanager</name>
         <transport>hwbinder</transport>
@@ -410,7 +506,7 @@
     <hal format="hidl">
         <name>vendor.qti.gnss</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>ILocHidlGnss</name>
             <instance>gnss_vendor</instance>
@@ -425,6 +521,33 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.data.latency</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ILinkLatency</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.factory</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.fm</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IFmHci</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.improvetouch.blobmanager</name>
         <transport>hwbinder</transport>
@@ -452,6 +575,15 @@
             <instance>TouchCompanionService</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.iop</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IIop</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.perf</name>
         <transport>hwbinder</transport>
@@ -582,6 +714,15 @@
             <instance>uimRemoteServer1</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.sensorscalibrate</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ISensorsCalibrate</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.hardware.tui_comm</name>
         <transport>hwbinder</transport>
@@ -591,6 +732,42 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.vpp</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IHidlVppService</name>
+            <instance>vppService</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.wifi.keystore</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IKeystoreExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.wigig.netperftuner</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>INetPerfTuner</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.wigig.supptunnel</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ISuppTunnelProvider</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.imsrtpservice</name>
         <transport>hwbinder</transport>

diff --git a/system.prop b/system.prop
index 2e5085b1659e91a4b0d1d6bcac4c3e5bd74cd138..9f43165571cb7fc2bc5bcf1e39ca142599ed0a21 100644 (file)
--- a/system.prop
+++ b/system.prop
@@ -1,4 +1 @@
-ro.display.series=OnePlus 5T
-sys.usb.controller=a800000.dwc3
-sys.usb.rndis.func.name=gsi
-sys.usb.rmnet.func.name=gsi
+ro.display.series=OnePlus 6

diff --git a/vendorsetup.sh b/vendorsetup.sh
index 1f0497d07f644836a4c7fa95f52b57c093ca6841..edb5351d8ce7829cc98eb6a8730f69a7bef6d137 100644 (file)
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,2 +1,2 @@
-add_lunch_combo omni_dumpling-eng
-add_lunch_combo omni_dumpling-userdebug
+add_lunch_combo omni_enchilada-eng
+add_lunch_combo omni_enchilada-userdebug