From b0746586915d1b7543476ec346d39e25825802cc Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 25 Jul 2022 14:59:05 +0800 Subject: [PATCH 1/2] Accelerate fetching trusty log Bug: 238980177 Test: vts-tradefed run vts -m VtsHalDumpstateTargetTest Change-Id: Ib26f3c217ef4826495ee0d98a659503de2fb5ab2 --- dumpstate/Dumpstate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 040ed446..636dfa73 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -1063,7 +1063,7 @@ void Dumpstate::dumpGscSection(int fd) { } void Dumpstate::dumpTrustySection(int fd) { - DumpFileToFd(fd, "Trusty TEE0 Logs", "/dev/trusty-log0"); + RunCommandToFd(fd, "Trusty TEE0 Logs", {"/vendor/bin/sh", "-c", "cat /dev/trusty-log0"}, CommandOptions::WithTimeout(1).Build()); } void Dumpstate::dumpModemSection(int fd) { From 424daa6932dd4b278a7e8e45520a520d867b12ff Mon Sep 17 00:00:00 2001 From: Roger Liao Date: Fri, 15 Jul 2022 15:58:53 +0800 Subject: [PATCH 2/2] Scale the flexibility for camera flash/autofocus settings Let clients determine the configuration of camera flash/autofocus features. Copy the rule by conditions: - android.hardware.camera.xml for a non auto-focus camera. - android.hardware.camera.flash-autofocus.xml for an auto-focus camera. Bug: 239142680 Test: adb shell pm list features Change-Id: I82fc7284743453712b6468efbb348c25b8c2ca88 --- device.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index a708664b..c94a8902 100644 --- a/device.mk +++ b/device.mk @@ -572,8 +572,16 @@ PRODUCT_COPY_FILES += \ 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.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml +# (See b/239142680, b/211840489, b/225749853) +ifneq ($(DISABLE_CAMERA_FS_AF),true) +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml +else +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.xml +endif + PRODUCT_COPY_FILES += \ - 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.concurrent.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.concurrent.xml \ frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml\