Snap for 6198741 from fa0fa16c0c7a2a85a33ebd8f92ec8022f12fed1e to sdk-releaseplatform-tools-29.0.6

Change-Id: I4b997c8b575120d30854de44841a3ca8b8fa7e57

33 files changed, 66 insertions, 46 deletions

diff --git a/db845c.mk b/db845c.mk
index 48f7875..6e360ee 100644
--- a/db845c.mk
+++ b/db845c.mk
@@ -1,3 +1,8 @@
+ifndef TARGET_KERNEL_USE
+TARGET_KERNEL_USE := 5.4
+endif
+DB845C_KERNEL_DIR := device/linaro/dragonboard-kernel/android-$(TARGET_KERNEL_USE)
+
 # Inherit the full_base and device configurations
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, device/linaro/dragonboard/db845c/device.mk)
@@ -8,3 +13,16 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 PRODUCT_NAME := db845c
 PRODUCT_DEVICE := db845c
 PRODUCT_BRAND := Android
+
+ifndef DB845C_USES_GKI
+DB845C_USES_GKI := true
+endif
+
+ifeq ($(DB845C_USES_GKI), true)
+DB845C_MODS := $(wildcard $(DB845C_KERNEL_DIR)/*.ko)
+ifneq ($(DB845C_MODS),)
+  BOARD_VENDOR_KERNEL_MODULES += $(DB845C_MODS)
+  DB845C_ONLY_VENDOR := %/btqca.ko %/hci_uart.ko
+  BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(DB845C_ONLY_VENDOR),$(DB845C_MODS))
+endif
+endif
diff --git a/db845c/BoardConfig.mk b/db845c/BoardConfig.mk
index ffc6047..3c925b3 100644
--- a/db845c/BoardConfig.mk
+++ b/db845c/BoardConfig.mk
@@ -4,6 +4,15 @@ include device/linaro/dragonboard/BoardConfigCommon.mk
 TARGET_BOOTLOADER_BOARD_NAME := db845c
 TARGET_BOARD_PLATFORM := db845c
 
+TARGET_NO_KERNEL := false
+BOARD_INCLUDE_DTB_IN_BOOTIMG := true
+BOARD_BOOT_HEADER_VERSION := 2
+BOARD_MKBOOTIMG_ARGS := --header_version $(BOARD_BOOT_HEADER_VERSION)
+BOARD_KERNEL_BASE := 0x80000000
+BOARD_KERNEL_PAGESIZE := 2048
+BOARD_KERNEL_CMDLINE := earlycon firmware_class.path=/vendor/firmware/ androidboot.hardware=db845c
+BOARD_KERNEL_CMDLINE += init=/init androidboot.boot_devices=soc/1d84000.ufshc printk.devkmsg=on
+
 # Image Configuration
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 #64M
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 21474836480 #20G
diff --git a/db845c/device.mk b/db845c/device.mk
index d15e188..be50f51 100644
--- a/db845c/device.mk
+++ b/db845c/device.mk
@@ -18,6 +18,8 @@
 $(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
 
 PRODUCT_COPY_FILES := \
+    $(DB845C_KERNEL_DIR)/Image.gz:kernel \
+    $(DB845C_KERNEL_DIR)/sdm845-db845c.dtb:dtb.img \
     device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_RAMDISK)/fstab.db845c \
     device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.db845c \
     device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/init/fstab.db845c \
diff --git a/db845c/firmware/devcfg.mbn b/db845c/firmware/devcfg.mbn
index 3f8e6ef..f7080e7 100644
--- a/db845c/firmware/devcfg.mbn
+++ b/db845c/firmware/devcfg.mbn
diff --git a/device-common.mk b/device-common.mk
index f9962d4..7be64f9 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -14,6 +14,9 @@
 # limitations under the License.
 #
 
+# Enable updating of APEXes
+$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+
 # Device overlay
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
 
@@ -83,7 +86,7 @@ PRODUCT_COPY_FILES += \
 
 # Enable BT
 PRODUCT_PACKAGES += \
-    android.hardware.bluetooth@1.0-service.btlinux
+    android.hardware.bluetooth@1.1-service.btlinux
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
@@ -94,11 +97,13 @@ PRODUCT_PACKAGES += \
     android.hardware.audio@4.0-impl:32 \
     android.hardware.audio.effect@4.0-impl:32 \
     android.hardware.audio@2.0-service \
-    android.hardware.soundtrigger@2.0-impl
+    android.hardware.soundtrigger@2.0-impl \
+    android.hardware.bluetooth.audio@2.0-impl
 
 # Build default bluetooth a2dp and usb audio HALs
 PRODUCT_PACKAGES += \
     audio.a2dp.default \
+    audio.bluetooth.default \
     audio.usb.default \
     audio.r_submix.default
 
@@ -163,3 +168,5 @@ PRODUCT_COPY_FILES +=  \
     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 \
     frameworks/native/data/etc/android.software.device_admin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_admin.xml
+
+PRODUCT_SOONG_NAMESPACES += external/mesa3d
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
index f954248..61b9063 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
@@ -1,30 +1,30 @@
-531857a19d5e802db7ee35400ebdda39  abl.elf
+9e5bd5524c1379c511dd92ea33393ad7  abl.elf
 71c6dd41e387ddb12c8553091928ec39  aop.mbn
 b6d81b360a5672d80c27430f39153e2c  boot-erase.img
 40e97319f57ab9d0b60009163ff940c2  BTFM.bin
 cbd3f7ab1a261c30e9e3178c0ec09428  cmnlib64.mbn
 7e89535018695c938593581134d14871  cmnlib.mbn
-32d0a65bdd9dc7b503676a1bdc4346a5  devcfg.mbn
+699e4dc2a0dbac11b255c79422744b44  devcfg.mbn
 d5cf22da99f6a871d4c7d43ce8eb801a  dspso.bin
 4400827c0a6689bfe118a67d79b4fcd7  flashall
-6fdda3231e99ba8324bec09b9bb34238  gpt_backup0.bin
-30281439a182ec57bb116b6c0911ff6b  gpt_backup1.bin
-4348e67458ab0a5f3d857caac7d4fb13  gpt_backup2.bin
-94122e11939ad0dbf7ea353496b29d4f  gpt_backup3.bin
-c5b0b7ed073ab1885bf21da348ea9106  gpt_backup4.bin
-e1564c466be4b2fac4125f214be6dc96  gpt_backup5.bin
-6cad911b5774140c5838269297d7b67a  gpt_both0.bin
-b3157ad3ac65f24eed4ca03464f455f9  gpt_both1.bin
-8975544619a3771866407913fab2ccd7  gpt_both2.bin
-d601e030036e26a146420a003a50eb99  gpt_both3.bin
-191e9eb2fb6112a152d540523c9b722b  gpt_both4.bin
-d756bdf96eb604a35de2fc62e7e877e3  gpt_both5.bin
-761da7b8ca5e3b175ffc9d11b12e9bd6  gpt_main0.bin
-f6fbf11adfcd149901f7b385f372f24f  gpt_main1.bin
-ba6d04e1ff8b692bff1fd49789118ae7  gpt_main2.bin
-47bf786ee544b96e00bbab68ec3d4241  gpt_main3.bin
-6562d2c13ec71271edd4ba217c3c3870  gpt_main4.bin
-92452d54cc100a1bb0c1e50b5910745f  gpt_main5.bin
+61362db524d6b1a082aa3e68c5ce5226  gpt_backup0.bin
+10711bd7b6c795b396ec7acc6546641b  gpt_backup1.bin
+1384ab8fa504bed08282b9fdbedd1256  gpt_backup2.bin
+f9f43f922865a282bd340731e2e4c05c  gpt_backup3.bin
+c98f59260b9d839fd66c7a799344763b  gpt_backup4.bin
+f1dd799d40155b2fb0a13e74dc708ef0  gpt_backup5.bin
+62809acaa9deeafbcf228ab3dec80fba  gpt_both0.bin
+1a45d3cc41bf1f7ab52c35a8dafde7c2  gpt_both1.bin
+26156f1cf28c2b03a52dc645e0776a6a  gpt_both2.bin
+836794cd35e92ac1865bca5bceb3afa8  gpt_both3.bin
+2a728d731064cb62a253e05fda09584c  gpt_both4.bin
+9b30da0d32e99c239a51c3d868960fde  gpt_both5.bin
+d3d913561434b15f1fd42b5c26b6e514  gpt_main0.bin
+42d103f66ffadf2fabe079c864d6ad2f  gpt_main1.bin
+33f9210eb72379fa4d737f7d968d69fe  gpt_main2.bin
+41530c11400b67d4efaca893a7bbc99f  gpt_main3.bin
+2ac0679ed66a373fc2a863dcb17bf6bf  gpt_main4.bin
+866e4769d16b95bb473441fa79b39d23  gpt_main5.bin
 94794668fb0a63c599e754cba52f6517  hyp.mbn
 35cc47772102f785807556e03135764a  imagefv.elf
 1fbaef77827cc531b5b7372ad1ee4937  keymaster64.mbn
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
index 4a5d7f9..a8e5195 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn
index 3f8e6ef..f7080e7 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
index a8d31d7..c293d6c 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
index 91d90f0..a7df42f 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
index 629a1af..9768f0d 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
index 5c15335..308f3d7 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
index c8d1815..047e1b0 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
index 5138a0b..51e1a4c 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
index 23e88d7..ecb66bf 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
index 8148ecb..c16f0bd 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
index df1479e..bd359d5 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
index 4ae8942..ae4516f 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
index cad3b85..bc2cf44 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
index 3180a75..47be07d 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
index eddb102..9fffcb8 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
index 8a28543..33c7c99 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
index fad7645..ea6d98f 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
index ecd0efd..ed6134e 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
index ef68ad2..e690bd8 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
diff --git a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
index 4aabafb..f7c071c 100644
--- a/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
+++ b/installer/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
diff --git a/installer/db845c/flash-all-aosp.sh b/installer/db845c/flash-all-aosp.sh
index 182278a..e6b1995 100755
--- a/installer/db845c/flash-all-aosp.sh
+++ b/installer/db845c/flash-all-aosp.sh
@@ -36,25 +36,11 @@ fastboot reboot bootloader
 # Slot _a is already marked as active by bootloader but just in case..
 echo "FLASH-ALL-AOSP: Mark _a slot as active"
 fastboot set_active a
+echo "FLASH-ALL-AOSP: Flash boot img"
+fastboot flash boot "${ANDROID_PRODUCT_OUT}"/boot.img
 echo "FLASH-ALL-AOSP: Flash super/dynamic image"
 fastboot flash super "${ANDROID_PRODUCT_OUT}"/super.img
 echo "FLASH-ALL-AOSP: Flash userdata image"
 fastboot flash userdata "${ANDROID_PRODUCT_OUT}"/userdata.img
 
-if [ "$1" != "" ]; then
-    ANDROID_BUILD_TOP=${INSTALLER_DIR}/../../../../../
-    ANDROID_OUT_HOST_BIN="${ANDROID_BUILD_TOP}/out/host/linux-x86/bin"
-
-    if [ ! -d "${ANDROID_OUT_HOST_BIN}" ]; then
-        echo "FLASH-ALL-AOSP: error in locating out/host/ directory for mkbootimg, check if it exist"
-        echo "FLASH-ALL-AOSP: can't build boot image with user provided ${1} kernel image"
-        exit
-    fi
-
-    echo "FLASH-ALL-AOSP: Building boot image with user provided ${1} kernel image"
-    ${ANDROID_OUT_HOST_BIN}/mkbootimg --kernel ${1} --ramdisk ${ANDROID_PRODUCT_OUT}/ramdisk.img --base 0x80000000 --pagesize 2048 --cmdline "firmware_class.path=/vendor/firmware/ androidboot.hardware=db845c init=/init androidboot.boot_devices=soc/1d84000.ufshc printk.devkmsg=on buildvariant=userdebug" --output ${ANDROID_PRODUCT_OUT}/boot.img
-
-    echo "FLASH-ALL-AOSP: Flash boot image"
-    fastboot flash boot ${ANDROID_PRODUCT_OUT}/boot.img
-    fastboot reboot
-fi
+fastboot reboot
diff --git a/installer/db845c/recovery.sh b/installer/db845c/recovery.sh
index 20fd45c..20fd45c 100644..100755
--- a/installer/db845c/recovery.sh
+++ b/installer/db845c/recovery.sh
diff --git a/manifest.xml b/manifest.xml
index d2d3477..2342860 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -91,7 +91,7 @@
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>IBluetoothHci</name>
             <instance>default</instance>
diff --git a/sepolicy/dnsmasq.te b/sepolicy/dnsmasq.te
deleted file mode 100644
index 1154d8a..0000000
--- a/sepolicy/dnsmasq.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# audit2allow
-allow dnsmasq netd:fifo_file getattr;
-allow dnsmasq netd:unix_stream_socket getattr;
diff --git a/sepolicy/kernel.te b/sepolicy/kernel.te
index 46bfee5..3fad122 100644
--- a/sepolicy/kernel.te
+++ b/sepolicy/kernel.te
@@ -3,3 +3,5 @@ allow kernel device:chr_file { create setattr };
 allow kernel device:dir { add_name create write };
 allow kernel self:capability mknod;
 allow kernel vendor_file:file { open read };
+allow kernel self:system module_request;
+allow vendor_init kernel:system module_request;
diff --git a/sepolicy/netd.te b/sepolicy/netd.te
deleted file mode 100644
index 2e954bb..0000000
--- a/sepolicy/netd.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# audit2allow
-allow netd kernel:system module_request;
-allow netd self:capability sys_module;
diff --git a/ueventd.common.rc b/ueventd.common.rc
index 173b6f4..b87dccf 100644
--- a/ueventd.common.rc
+++ b/ueventd.common.rc
@@ -1,3 +1,5 @@
+modalias_handling enabled
+
 /dev/sw_sync              0660   root       graphics
 
 # gpu