From a3a42642f37eafbc2d460979d829a304e08e5d83 Mon Sep 17 00:00:00 2001 From: Jeffrey Carlyle Date: Mon, 22 Aug 2022 14:37:19 -0700 Subject: [PATCH 1/2] dck: pick up recovery mode library for digital car key wiping This is done by pick optionally including a Makefile so that aosp builds in which the library is not present will pass. Bug: 203234558 Test: adb reboot recovery; wipe data via menu; verify keys removed Signed-off-by: Jeffrey Carlyle Change-Id: I53967a5e8ea0327d6467623929902b90eb2c85da --- BoardConfig-common.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 9ca97737..0f7c8822 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -414,3 +414,6 @@ BOARD_KERNEL_CMDLINE += log_buf_len=1024K # Protected VM firmware BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000 + +# pick up library for cleaning digital car keys on factory reset +-include vendor/google_devices/gs-common/proprietary/BoardConfigVendor.mk From 21ffd5f188c2253b927596bb9c0b72bb57a78002 Mon Sep 17 00:00:00 2001 From: Robb Glasser Date: Thu, 18 Aug 2022 16:56:48 -0700 Subject: [PATCH 2/2] Dump usf stats history in bugreports. USF saves a stat buffer to the filesystem periodically. Dump this as part of bugreports. Bug: 242320914 Test: Stats are visible in a bugreport. Change-Id: I2020f48026fcad19e41c8959e404e0a0783a2ef0 --- dumpstate/Dumpstate.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index ddd2942b..7c314604 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -1066,6 +1066,9 @@ void Dumpstate::dumpSensorsUSFSection(int fd) { RunCommandToFd(fd, "USF Registry", {"/vendor/bin/sh", "-c", "usf_reg_edit save -"}, options); + RunCommandToFd(fd, "USF Last Stat Buffer", + {"/vendor/bin/sh", "-c", "cat /data/vendor/sensors/debug/stats.history"}, + options); } } }