From fd92ecb65c5315b331e27b447fa48cab17266f8c Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 29 Aug 2024 11:06:25 +0000 Subject: [PATCH 1/9] 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 c8436d8183f7c78233ce9b23eda063ae697db577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Mon, 9 Sep 2024 17:03:22 +0000 Subject: [PATCH 2/9] Delete PRODUCT_FULL_TREBLE_OVERRIDE. This variable doesn't do anything for devices launching with API level 26 or later, and the initial zuma devices (Pixel 8) launched with API level 34. Bug: 307369186 Test: presubmit Flag: EXEMPT trivial build cleanup Change-Id: I181937f9e49d4b9e1088fc92df7681d1a39e3d26 --- BoardConfig-common.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index abc4803a..2a1898eb 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -19,9 +19,6 @@ include build/make/target/board/BoardConfigPixelCommon.mk # Include settings for 16k developer option, if enabled include device/google/zuma/BoardConfig-16k-common.mk -# Should be uncommented after fixing vndk-sp violation is fixed. -PRODUCT_FULL_TREBLE_OVERRIDE := true - # HACK : To fix up after bring up multimedia devices. TARGET_SOC := zuma From 54ceb87f8ef976824845c61d50f7ca21239f89c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Fri, 6 Sep 2024 22:30:41 +0000 Subject: [PATCH 3/9] Delete PRODUCT_FULL_TREBLE_OVERRIDE. This variable doesn't do anything for devices launching with API level 26 or later, and the initial zuma devices (Pixel 8) launched with API level 34. Bug: 307369186 Test: presubmit Flag: EXEMPT trivial build cleanup Change-Id: I181937f9e49d4b9e1088fc92df7681d1a39e3d26 Merged-In: I181937f9e49d4b9e1088fc92df7681d1a39e3d26 --- BoardConfig-common.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index fee3bb32..d5f6c6c1 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -16,9 +16,6 @@ include build/make/target/board/BoardConfigMainlineCommon.mk include build/make/target/board/BoardConfigPixelCommon.mk -# Should be uncommented after fixing vndk-sp violation is fixed. -PRODUCT_FULL_TREBLE_OVERRIDE := true - # HACK : To fix up after bring up multimedia devices. TARGET_SOC := zuma From 069a8098b309c5e0e859db48afa7dc86b8910548 Mon Sep 17 00:00:00 2001 From: Daniel Rosenberg Date: Mon, 15 Jul 2024 18:42:15 -0700 Subject: [PATCH 4/9] 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 5/9] 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 6/9] 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 From f52ee80ff654533c480a7ce2f9f4f8fcc4a5af7e Mon Sep 17 00:00:00 2001 From: Chia-Chi Teng Date: Tue, 10 Sep 2024 01:56:29 +0000 Subject: [PATCH 7/9] Deprecate preloaded_nanoapps.json Flag: EXEMPT resource only update Bug: 350102369 Test: on device and presubmit Change-Id: I5b5c3fe3a37199f3a55cb6e0e31f0ce141bc0dda --- device.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/device.mk b/device.mk index dfc9f155..1266f66f 100644 --- a/device.mk +++ b/device.mk @@ -469,8 +469,6 @@ PRODUCT_COPY_FILES += \ ## Enable the CHRE Daemon CHRE_USF_DAEMON_ENABLED := false CHRE_DEDICATED_TRANSPORT_CHANNEL_ENABLED := true -PRODUCT_PACKAGES += \ - preloaded_nanoapps.json # Filesystem management tools PRODUCT_PACKAGES += \ From 2dbe6e6fd22bb9b12c72ce6428edc391762abe6b Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Tue, 10 Sep 2024 13:55:10 -0700 Subject: [PATCH 8/9] Support 16KB data reset We didn't add the formattable flag to ext4 fstab entry because init only uses the first entry for re-formatting, but now init can choose the right fs type base on page size, we can add the formattable flag. Now data resets in 16KB mode would go back to ext4. Test: th Bug: 356202847 Change-Id: Ieb01c2592b3bb8e3342b2b6178ee73c0fb8a4288 --- conf/f2fs/fstab.zuma.f2fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/f2fs/fstab.zuma.f2fs b/conf/f2fs/fstab.zuma.f2fs index 10b82262..47682dee 100644 --- a/conf/f2fs/fstab.zuma.f2fs +++ b/conf/f2fs/fstab.zuma.f2fs @@ -5,6 +5,6 @@ # # /dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device -/dev/block/platform/13200000.ufs/by-name/userdata /data ext4 noatime,nosuid,nodev,@inlinecrypt@ latemount,wait,check,quota,reservedsize=128M,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption +/dev/block/platform/13200000.ufs/by-name/userdata /data ext4 noatime,nosuid,nodev,@inlinecrypt@ latemount,wait,check,quota,formattable,reservedsize=128M,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption /dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount /dev/block/platform/13200000.ufs/by-name/metadata /metadata ext4 noatime,nosuid,nodev,data=journal,commit=1 wait,check,first_stage_mount,metadata_csum From c46756b74a6d0cca8e0057f1fba76c7ff388df40 Mon Sep 17 00:00:00 2001 From: Pawan Wagh Date: Thu, 12 Sep 2024 16:24:28 +0000 Subject: [PATCH 9/9] 16kb: Filter out zram.ko for dev options Test: atest Enable16KbTest Flag: EXEMPT bugfix Bug: 363412208 Change-Id: Ib1e135889186eeccb21448e16660701967c92c5c --- BoardConfig-16k-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardConfig-16k-common.mk b/BoardConfig-16k-common.mk index 6498e054..d636e9ad 100644 --- a/BoardConfig-16k-common.mk +++ b/BoardConfig-16k-common.mk @@ -33,6 +33,7 @@ BOARD_PREBUILT_DTBOIMAGE_16KB := $(TARGET_KERNEL_DIR_16K)/dtbo.img # Zuma targets use exynos-bcm_dbg.ko module instead of bcm_dbg.ko. BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K)) +BOARD_KERNEL_MODULES_16K := $(filter-out %/zram.ko,$(BOARD_KERNEL_MODULES_16K)) BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module))) BOARD_16K_OTA_USE_INCREMENTAL := true