Snap for 8873354 from 6d5272b851
to udc-release
Change-Id: Icba7812589bd0c683d3b87defc52a5025d593fb7
This commit is contained in:
commit
376e992483
2 changed files with 18 additions and 2 deletions
10
device.mk
10
device.mk
|
@ -585,8 +585,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\
|
||||
|
|
|
@ -976,6 +976,14 @@ void Dumpstate::dumpDisplaySection(int fd) {
|
|||
DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo");
|
||||
DumpFileToFd(fd, "Secondary panel name", "/sys/devices/platform/exynos-drm/secondary-panel/panel_name");
|
||||
DumpFileToFd(fd, "Secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo");
|
||||
if (!PropertiesHelper::IsUserBuild()) {
|
||||
DumpFileToFd(fd, "HWC Fence State", "/data/vendor/log/hwc/hwc_fence_state.txt");
|
||||
DumpFileToFd(fd, "HWC Error Log", "/data/vendor/log/hwc/hwc_error_log.txt");
|
||||
RunCommandToFd(fd, "HWC Debug Dumps", {"/vendor/bin/sh", "-c",
|
||||
"for f in $(ls /data/vendor/log/hwc/*_hwc_debug*.dump); do "
|
||||
"echo $f ; cat $f ; done"},
|
||||
CommandOptions::WithTimeout(2).Build());
|
||||
}
|
||||
}
|
||||
|
||||
// Dump items related to AoC
|
||||
|
@ -1074,7 +1082,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) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue