From fd92ecb65c5315b331e27b447fa48cab17266f8c Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 29 Aug 2024 11:06:25 +0000 Subject: [PATCH 1/4] audio: set util_clamp_min for s/w spatializer to avoid glitches - power measurement result is on b/262803152#comment5 Bug: 355912013 Test: spatial audio Flag: EXEMPT bugfix Change-Id: I324288f219b2fecbc0ae4f3ce3c11ea6e93f4b2e --- device.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device.mk b/device.mk index 2e3f7712..280e0fd8 100644 --- a/device.mk +++ b/device.mk @@ -578,6 +578,9 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2 PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2 PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000 +# Set util_clamp_min for s/w spatializer +PRODUCT_PROPERTY_OVERRIDES += audio.spatializer.effect.util_clamp_min=300 + # Calliope firmware overwrite #PRODUCT_COPY_FILES += \ device/google/zuma/firmware/calliope_dram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram.bin \ From 069a8098b309c5e0e859db48afa7dc86b8910548 Mon Sep 17 00:00:00 2001 From: Daniel Rosenberg Date: Mon, 15 Jul 2024 18:42:15 -0700 Subject: [PATCH 2/4] Fix CopyEfsTest for symlinks Use the -L flag to preserve symlinks. Fixed various flags to ensure we handle symlinks right, and adjusted the awk string to handle difference in how dates are represented. Test: atest CopyEfsTest Flag: TEST_ONLY Bug: 352567354 Change-Id: I686c16fc1d771bf00bdc7465beb29a91eaef9e46 --- CopyEfsTest/src/com/android/test/CopyEfsTest.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/CopyEfsTest/src/com/android/test/CopyEfsTest.java b/CopyEfsTest/src/com/android/test/CopyEfsTest.java index 23152fc3..6ff1638c 100644 --- a/CopyEfsTest/src/com/android/test/CopyEfsTest.java +++ b/CopyEfsTest/src/com/android/test/CopyEfsTest.java @@ -69,15 +69,22 @@ public class CopyEfsTest extends BaseHostJUnit4Test { r = getDevice().executeShellV2Command("umount /data/local/tmp/efs_test/mnt"); assertEquals(r.getExitCode().intValue(), 0); - r = getDevice().executeShellV2Command(String.format("dump.f2fs -rfPo /data/local/tmp/efs_test/dump /data/local/tmp/efs_test/%s.img", name)); + r = getDevice().executeShellV2Command(String.format("dump.f2fs -rfPLo /data/local/tmp/efs_test/dump /data/local/tmp/efs_test/%s.img", name)); assertEquals(r.getExitCode().intValue(), 0); r = getDevice().executeShellV2Command(String.format("mount -r /data/local/tmp/efs_test/%s.img /data/local/tmp/efs_test/mnt", name)); assertEquals(r.getExitCode().intValue(), 0); - assertEquals("", getDevice().executeShellCommand("diff -rq /data/local/tmp/efs_test/mnt /data/local/tmp/efs_test/dump")); - // Remove timestamps at positions 6 and 7, because ls on device does not support --time-style + r = getDevice().executeShellV2Command("diff -rq --no-dereference /data/local/tmp/efs_test/mnt /data/local/tmp/efs_test/dump"); + assertEquals(r.getExitCode().intValue(), 0); + assertEquals(r.getStdout(), ""); + + // Remove timestamps because ls on device does not support --time-style. This is AWKward. + // Format is [permissions] [links] [uid] [gid] [size] time [name/symlink] + // time may have different numbers of blocks + // symlinks will be of the form a -> b + // So we can check for -> in the second to last spot to determine what position the timestamp ends at // Remove totals because on disk block usage may change depending on filesystem - String ls_cmd = "cd /data/local/tmp/efs_test/%s;ls -AlLnR . | awk {'$6=\"\";$7=\"\";if ($1 != \"total\"){print $0}'}"; + String ls_cmd = "cd /data/local/tmp/efs_test/%s;ls -AlnR . | awk {'if (NF>3 && $(NF-1) == \"->\") end=3; else end=1; for(i=6;i<=NF-end && i>0;i++)$i=\"\";if ($1 != \"total\"){print $0}'}"; String mnt_ls = getDevice().executeShellCommand(String.format(ls_cmd, "mnt")); assertEquals(getDevice().executeShellCommand("echo $?"), "0\n"); String dump_ls = getDevice().executeShellCommand(String.format(ls_cmd, "dump")); From 175979b0ca9ed112ed73c1902a5ea93c46c8d298 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 12 Jul 2024 21:21:48 +0000 Subject: [PATCH 3/4] Add persist to CopyEfsTest Change-Id: I8e12b0ac5e529e15697f35b88ac8b43c798fedd1 Test: atest CopyEfsTest Flag: TEST_ONLY Bug: 352567354 --- CopyEfsTest/src/com/android/test/CopyEfsTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/CopyEfsTest/src/com/android/test/CopyEfsTest.java b/CopyEfsTest/src/com/android/test/CopyEfsTest.java index 6ff1638c..9314174d 100644 --- a/CopyEfsTest/src/com/android/test/CopyEfsTest.java +++ b/CopyEfsTest/src/com/android/test/CopyEfsTest.java @@ -56,6 +56,7 @@ public class CopyEfsTest extends BaseHostJUnit4Test { testDumpF2FS("efs"); testDumpF2FS("efs_backup"); testDumpF2FS("modem_userdata"); + testDumpF2FS("persist"); } private void testDumpF2FS(String name) throws Exception { From dd3eec86779ea2cd452bfa614ddf7e83f9a8d120 Mon Sep 17 00:00:00 2001 From: Pawan Wagh Date: Mon, 9 Sep 2024 21:04:48 +0000 Subject: [PATCH 4/4] Revert "Disable incremental boot_otas" This reverts commit 8bb0da99a978bd6c56ba52f4f630a43356a273ae. Reason for revert: Incremental ota support is now available: b/339658378 Fixes disk size regression issue now that OTA signing issues are resolved. Change-Id: Id897a60473e6ea99522d9ab372511e7c2ebdd757 --- BoardConfig-16k-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardConfig-16k-common.mk b/BoardConfig-16k-common.mk index 0571d7a5..f7bee9d1 100644 --- a/BoardConfig-16k-common.mk +++ b/BoardConfig-16k-common.mk @@ -33,5 +33,6 @@ BOARD_PREBUILT_DTBOIMAGE_16KB := $(TARGET_KERNEL_DIR_16K)/dtbo.img BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K)) BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module))) +BOARD_16K_OTA_USE_INCREMENTAL := true BOARD_16K_OTA_MOVE_VENDOR := true endif