From 4db75dda18cbf22380b266428116024e36363075 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Mon, 16 May 2022 18:00:00 +0800 Subject: [PATCH 1/8] dumpstate: Dump logs Bug: 232556226 Test: log dumped in bugreport Signed-off-by: Kyle Tso Change-Id: Iacd4db38dd56c1d5ba6f58c757f023795a9c3a3b Merged-In: Iacd4db38dd56c1d5ba6f58c757f023795a9c3a3b --- conf/init.gs101.rc | 1 + dumpstate/DumpstateDevice.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index 9898a7d3..bf63c26f 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -219,6 +219,7 @@ on init chown system system /dev/logbuffer_ttf chown system system /dev/logbuffer_tcpm chown system system /dev/logbuffer_usbpd + chown system system /dev/logbuffer_pogo_transport chown system system /dev/logbuffer_wireless chown system system /dev/logbuffer_pca9468 chown system system /dev/logbuffer_cpm diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 4b285b4e..b75ba64f 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -375,6 +375,7 @@ void DumpstateDevice::dumpPowerSection(int fd) { "echo \"contaminant_detection_status:\"; cat $f/contaminant_detection_status; done"}); DumpFileToFd(fd, "PD Engine", "/dev/logbuffer_usbpd"); + DumpFileToFd(fd, "POGO Transport", "/dev/logbuffer_pogo_transport"); DumpFileToFd(fd, "PPS-google_cpm", "/dev/logbuffer_cpm"); DumpFileToFd(fd, "PPS-dc", "/dev/logbuffer_pca9468"); From b495f66b8559d36f0b500c755a952976413620d1 Mon Sep 17 00:00:00 2001 From: Wiwit Rifa'i Date: Tue, 17 May 2022 15:30:37 +0800 Subject: [PATCH 2/8] dumpstate: add HWC logs Add hwc log files in /data/vendor/log/hwc to dumpstate. Bug: 230361290 Test: Manual - 'adb bugreport' Change-Id: Id23a16f42ecbdf75d83e056c7cba076041e19176 --- dumpstate/DumpstateDevice.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index b75ba64f..7da9b3fc 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -961,6 +961,10 @@ void DumpstateDevice::dumpDisplaySection(int fd) { CommandOptions::WithTimeout(2).Build()); DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo"); DumpFileToFd(fd, "secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo"); + RunCommandToFd(fd, "HWC logs", {"/vendor/bin/sh", "-c", + "for f in $(ls /data/vendor/log/hwc/*hwc_*); do " + "echo $f ; cat $f ; done"}, + CommandOptions::WithTimeout(2).Build()); } // Dump items related to AoC From a5fd932de487f3f4096da86ed4b7d3f0478b7b56 Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Wed, 18 May 2022 16:46:06 -0700 Subject: [PATCH 3/8] Remove android.hardware.renderscript HAL from manifest The renderscript passthrough HAL implementation (android.hardware.renderscript@1.0-impl.so) does not exist on the device, so this CL removes android.hardware.renderscript from the manifest. Bug: 231277723 Test: mma Test: presubmit Test: VtsHalRenderscriptV1_0TargetTest Change-Id: I461339ce6043a771537e95552674f4165e99e288 Merged-In: I461339ce6043a771537e95552674f4165e99e288 (cherry picked from commit 9e7b96b53d00894e82d0a0d0f633cc0cbc41d8a4) --- manifest_64.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest_64.xml b/manifest_64.xml index d1bc1559..d8eeb2a6 100644 --- a/manifest_64.xml +++ b/manifest_64.xml @@ -53,15 +53,6 @@ default - - android.hardware.renderscript - passthrough - 1.0 - - IDevice - default - - android.hardware.dumpstate hwbinder From 2af8be21c8aeeee4d10fe691382f4122a4007db0 Mon Sep 17 00:00:00 2001 From: susi_su Date: Thu, 20 Jan 2022 14:07:12 +0800 Subject: [PATCH 4/8] Declare IDisplay aidl interface to V5 Bug: 176922790 test: local test with a histogram client program Change-Id: I0481381811e1b9fccde347f73cb4446939bce4dc --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index a1e4e779..c7b30e25 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -73,7 +73,7 @@ com.google.hardware.pixel.display - 4 + 5 IDisplay default From e571bb8979d1d51e558b9bc089dce239643d2a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Cl=C3=A9ment=20Tosi?= Date: Wed, 15 Dec 2021 14:37:27 +0100 Subject: [PATCH 5/8] gs101: Add pvmfw to AB_OTA_PARTITIONS Suggested-by: Cyan_Hsieh Bug: 210833963 Test: OTA update Change-Id: Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d Merged-In: Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d (cherry picked from commit 871071afbc35874f68a93ad1507d0f22d53ae40e) --- BoardConfig-common.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 5a0f14d2..417e28a1 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -94,6 +94,9 @@ endif ifneq ($(PRODUCT_BUILD_VBMETA_IMAGE),false) AB_OTA_PARTITIONS += vbmeta endif +ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false) +AB_OTA_PARTITIONS += pvmfw +endif # EMULATOR common modules BOARD_EMULATOR_COMMON_MODULES := liblight From 7bb4293087876144d5444ebd5146983399256622 Mon Sep 17 00:00:00 2001 From: Akilesh Kailash Date: Fri, 20 May 2022 06:22:54 +0000 Subject: [PATCH 6/8] Revert "gs101: Enable system_dlkm dynamic partition" This reverts commit 58893b442fe64f8061323c5b0cecb210531ed882. Reason for revert: OTA failues observed during S -> T Bug: 228927535 Test: Full and Incremental OTA's. Change-Id: Iec9e15d60dab92213494c9e679de6702f8d56e37 --- BoardConfig-common.mk | 9 +-------- conf/fstab.gs101.in | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 1009bb4a..b5843c7c 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -82,7 +82,6 @@ AB_OTA_UPDATER := true AB_OTA_PARTITIONS += \ system \ - system_dlkm \ system_ext \ product \ vbmeta_system @@ -133,7 +132,7 @@ $(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLO #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true # Enable chain partition for system. -BOARD_AVB_VBMETA_SYSTEM := system system_dlkm system_ext product +BOARD_AVB_VBMETA_SYSTEM := system system_ext product BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) @@ -161,11 +160,6 @@ TARGET_COPY_OUT_PRODUCT := product BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_SYSTEM_EXT := system_ext -# system_dlkm.img -BOARD_USES_SYSTEM_DLKMIMAGE := true -BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm - ######################## # Video Codec ######################## @@ -183,7 +177,6 @@ BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 8527020032 BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \ system \ - system_dlkm \ system_ext \ product \ vendor \ diff --git a/conf/fstab.gs101.in b/conf/fstab.gs101.in index 5ad10a3c..8b7a7e3b 100644 --- a/conf/fstab.gs101.in +++ b/conf/fstab.gs101.in @@ -5,7 +5,6 @@ # # system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_dlkm /system_dlkm ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 product /product ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 From 3ba1a0dd6b536a7947c62625b1c83afb8ad115e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Cl=C3=A9ment=20Tosi?= Date: Tue, 24 May 2022 18:53:47 +0000 Subject: [PATCH 7/8] Revert "gs101: Add pvmfw to AB_OTA_PARTITIONS" This reverts commit e571bb8979d1d51e558b9bc089dce239643d2a18. Reason for revert: Breaks aosp_raven-userdebug (go/ab/8636239) as pvmfw.img is in PREBUILT_IMAGES/ but add_img_to_target_files.py looks for IMAGES/pvmfw.img. Change-Id: I179e8ebda19e9f10e80ba2b7ee0f5fdb40a1c7d4 --- BoardConfig-common.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 417e28a1..5a0f14d2 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -94,9 +94,6 @@ endif ifneq ($(PRODUCT_BUILD_VBMETA_IMAGE),false) AB_OTA_PARTITIONS += vbmeta endif -ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false) -AB_OTA_PARTITIONS += pvmfw -endif # EMULATOR common modules BOARD_EMULATOR_COMMON_MODULES := liblight From 557e70add336faa1a6b6f4d0d6c90d5285640d4d Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Thu, 5 May 2022 15:29:08 -0700 Subject: [PATCH 8/8] Deprecate allocator 4.0 in favor of AIDL V1 Bug: 220910504 Bug: 228405226 Fix: 233412845 Test: go/allocator4-deprecate Change-Id: Ie6826b539fb1c780f4860acce440765ee3f99517 --- device.mk | 2 -- manifest.xml | 9 --------- manifest_64.xml | 9 --------- 3 files changed, 20 deletions(-) diff --git a/device.mk b/device.mk index 3a85217e..6cb0b3b0 100644 --- a/device.mk +++ b/device.mk @@ -506,8 +506,6 @@ PRODUCT_PACKAGES += \ # for now include gralloc here. should come from hardware/google_devices/exynos5 PRODUCT_PACKAGES += \ android.hardware.graphics.mapper@4.0-impl \ - android.hardware.graphics.allocator@4.0-service \ - android.hardware.graphics.allocator@4.0-impl \ android.hardware.graphics.allocator-V1-service PRODUCT_PACKAGES += \ diff --git a/manifest.xml b/manifest.xml index 1d59695c..1cb5345a 100644 --- a/manifest.xml +++ b/manifest.xml @@ -39,15 +39,6 @@ default - - android.hardware.graphics.allocator - hwbinder - 4.0 - - IAllocator - default - - android.hardware.graphics.mapper passthrough diff --git a/manifest_64.xml b/manifest_64.xml index d1bc1559..09466c99 100644 --- a/manifest_64.xml +++ b/manifest_64.xml @@ -26,15 +26,6 @@ default - - android.hardware.graphics.allocator - hwbinder - 4.0 - - IAllocator - default - - android.hardware.graphics.mapper passthrough