From 66b1565ce2d7fd78b94f7bde988f58e27b64639a Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Thu, 25 Jan 2024 21:35:37 +0000 Subject: [PATCH 1/9] Revert "dumpstate: Search the path of TCPM psy uevent" Revert submission 25915320-320613177 Reason for revert: Droidfood blocking bug: 322294676 Reverted changes: /q/submissionid:25915320-320613177 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ab48b5502ce6a48d13a76442cfc68f066f6e5be7) Merged-In: I5f56d9f97d173b9971e96959b56e39207b901ac7 Change-Id: I5f56d9f97d173b9971e96959b56e39207b901ac7 --- dumpstate/dump_power.cpp | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp index 562dc7cc..e6ee5799 100644 --- a/dumpstate/dump_power.cpp +++ b/dumpstate/dump_power.cpp @@ -152,26 +152,6 @@ void dumpAcpmStats() { readContentsOfDir(acpmTitle, acpmDir, statsSubStr, true, true); } -void dumpTcpmPsyUevent() { - const char* tcpmPsy = "tcpm-source-psy-"; - DIR *dir = opendir("/sys/class/power_supply/"); - struct dirent *entry; - - if (dir == NULL) - return; - - while ((entry = readdir(dir)) != NULL) { - if (std::string::npos != std::string(entry->d_name).find(tcpmPsy)) { - std::string fullPath("/sys/class/power_supply/" + (const std::string)entry->d_name + - "/uevent"); - dumpFileContent("Power supply property tcpm", fullPath.c_str()); - break; - } - } - - closedir(dir); -} - void dumpPowerSupplyStats() { const char* dumpList[][2] = { {"CPU PM stats", "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"}, @@ -182,6 +162,7 @@ void dumpPowerSupplyStats() { {"Power supply property gcpm_pps", "/sys/class/power_supply/gcpm_pps/uevent"}, {"Power supply property main-charger", "/sys/class/power_supply/main-charger/uevent"}, {"Power supply property dc-mains", "/sys/class/power_supply/dc-mains/uevent"}, + {"Power supply property tcpm", "/sys/class/power_supply/tcpm-source-psy-11-0025/uevent"}, {"Power supply property usb", "/sys/class/power_supply/usb/uevent"}, {"Power supply property wireless", "/sys/class/power_supply/wireless/uevent"}, }; @@ -189,8 +170,6 @@ void dumpPowerSupplyStats() { for (const auto &row : dumpList) { dumpFileContent(row[0], row[1]); } - - dumpTcpmPsyUevent(); } void dumpMaxFg() { From 9bbe072585bc64cc53e3e320fd0bbdb7f1f1fbbe Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Thu, 25 Jan 2024 21:35:37 +0000 Subject: [PATCH 2/9] Revert "dumpstate: Search the path of TCPM psy uevent" Revert submission 25915320-320613177 Reason for revert: Droidfood blocking bug: 322294676 Reverted changes: /q/submissionid:25915320-320613177 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ab48b5502ce6a48d13a76442cfc68f066f6e5be7) Merged-In: I5f56d9f97d173b9971e96959b56e39207b901ac7 Change-Id: I5f56d9f97d173b9971e96959b56e39207b901ac7 --- dumpstate/dump_power.cpp | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp index 562dc7cc..e6ee5799 100644 --- a/dumpstate/dump_power.cpp +++ b/dumpstate/dump_power.cpp @@ -152,26 +152,6 @@ void dumpAcpmStats() { readContentsOfDir(acpmTitle, acpmDir, statsSubStr, true, true); } -void dumpTcpmPsyUevent() { - const char* tcpmPsy = "tcpm-source-psy-"; - DIR *dir = opendir("/sys/class/power_supply/"); - struct dirent *entry; - - if (dir == NULL) - return; - - while ((entry = readdir(dir)) != NULL) { - if (std::string::npos != std::string(entry->d_name).find(tcpmPsy)) { - std::string fullPath("/sys/class/power_supply/" + (const std::string)entry->d_name + - "/uevent"); - dumpFileContent("Power supply property tcpm", fullPath.c_str()); - break; - } - } - - closedir(dir); -} - void dumpPowerSupplyStats() { const char* dumpList[][2] = { {"CPU PM stats", "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"}, @@ -182,6 +162,7 @@ void dumpPowerSupplyStats() { {"Power supply property gcpm_pps", "/sys/class/power_supply/gcpm_pps/uevent"}, {"Power supply property main-charger", "/sys/class/power_supply/main-charger/uevent"}, {"Power supply property dc-mains", "/sys/class/power_supply/dc-mains/uevent"}, + {"Power supply property tcpm", "/sys/class/power_supply/tcpm-source-psy-11-0025/uevent"}, {"Power supply property usb", "/sys/class/power_supply/usb/uevent"}, {"Power supply property wireless", "/sys/class/power_supply/wireless/uevent"}, }; @@ -189,8 +170,6 @@ void dumpPowerSupplyStats() { for (const auto &row : dumpList) { dumpFileContent(row[0], row[1]); } - - dumpTcpmPsyUevent(); } void dumpMaxFg() { From 07f89b88fc2b6c0c88652bcfd02a5cc15d39d5cf Mon Sep 17 00:00:00 2001 From: Shashwat Razdan Date: Tue, 5 Mar 2024 23:46:52 -0800 Subject: [PATCH 3/9] Adding android.software.contextualsearch to zuma devices. Bug: 326143814 Test: Built and tested on device (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ceb5170ce03587387eaf794a4ee5d0c68540664) Merged-In: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07 Change-Id: I4ee1ecd9e292d6e1807ba1f77851e53380db0a07 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 72a74752..0a3ef25b 100644 --- a/device.mk +++ b/device.mk @@ -287,6 +287,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \ + frameworks/native/data/etc/android.software.contextualsearch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.contextualsearch.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ frameworks/native/data/etc/android.software.opengles.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml From 1e0c02c5ded132b4a1477a60e0ee0d9c2d088bdc Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Tue, 5 Mar 2024 00:55:40 +0000 Subject: [PATCH 4/9] Revert "Add betterbug mk to zuma" Revert submission 26348985-bb-sepolicy-poc Reason for revert: Droidfood blocking bug: b/327991669 Bug: b/327991669 Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fe980182cc8f21d7af154271d58aff971f72132c) Merged-In: I83de6f389e4ce5113afd751871e0e10e67fb0b4f Change-Id: I83de6f389e4ce5113afd751871e0e10e67fb0b4f --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 0a3ef25b..50b872e5 100644 --- a/device.mk +++ b/device.mk @@ -42,7 +42,6 @@ include device/google/gs-common/sota_app/factoryota.mk include device/google/gs-common/misc_writer/misc_writer.mk include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk -include device/google/gs-common/betterbug/betterbug.mk include device/google/zuma/dumpstate/item.mk From 956405c6c0f79e1c228bc348c342020d288f84e3 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Fri, 22 Mar 2024 21:33:35 +0800 Subject: [PATCH 5/9] Update health AIDL HAL to V3 Bug: 328327545 Test: TH Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test Signed-off-by: Jack Wu (cherry picked from https://android-review.googlesource.com/q/commit:40f89b2d464071389d395f39928ef0e6d99bf2fb) Merged-In: I7582ba278abcb30cebe041f775efe45633a58bad Change-Id: I7582ba278abcb30cebe041f775efe45633a58bad --- health/android.hardware.health-service.zuma.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/health/android.hardware.health-service.zuma.xml b/health/android.hardware.health-service.zuma.xml index 1fe9b8d2..2acaabac 100644 --- a/health/android.hardware.health-service.zuma.xml +++ b/health/android.hardware.health-service.zuma.xml @@ -1,7 +1,7 @@ android.hardware.health - 2 + 3 IHealth/default From e3ed1eabdf56bb1d7ef9b01b45014639ca890f10 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Tue, 4 Jun 2024 09:56:33 -0700 Subject: [PATCH 6/9] Use dump.f2fs to extract files from efs partitions Previously, we rely on mount points to copy files out of efs partitions. Switch over to dump.f2fs to read directly from block device without mounting. This allows us to copy files out of efs partition in both 4K and 16K mode. Test: Boot dev option enabled ext4 device Bug: 340965747 Change-Id: I9d3f3d5200adc31f13298488b5be068b0fe7c7f4 --- conf/init.efs.16k.rc | 5 ----- copy_efs_files_to_data.sh | 12 ++++-------- device.mk | 1 + 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/conf/init.efs.16k.rc b/conf/init.efs.16k.rc index 9e891680..c3434bfd 100644 --- a/conf/init.efs.16k.rc +++ b/conf/init.efs.16k.rc @@ -9,12 +9,7 @@ service copy_efs_files_to_data /vendor/bin/copy_efs_files_to_data on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ext4 mkdir /data/vendor/copied 0775 radio system restorecon_recursive /data/vendor/copied - restorecon_recursive /mnt/vendor - mount_all /vendor/etc/fstab.efs - mount_all /vendor/etc/fstab.persist exec_start copy_efs_files_to_data - umount_all /vendor/etc/fstab.efs - umount_all /vendor/etc/fstab.persist mount_all /vendor/etc/fstab.efs.from_data restorecon_recursive /mnt/vendor/efs restorecon_recursive /mnt/vendor/efs_backup diff --git a/copy_efs_files_to_data.sh b/copy_efs_files_to_data.sh index 898bc8e9..2ac9e462 100644 --- a/copy_efs_files_to_data.sh +++ b/copy_efs_files_to_data.sh @@ -8,19 +8,19 @@ $BIN_DIR/mkdir -p $CHECKPOINT_DIR function copy_files_to_data() { + block_device=$1 partition_name=$(basename $1) mount_point=$2 tmpdir=$CHECKPOINT_DIR/$partition_name.img build_checkpoint=$CHECKPOINT_DIR/$partition_name if [ ! -e $build_checkpoint ]; then $BIN_DIR/rm -rf $tmpdir - $BIN_DIR/rm -rf $build_checkpoint - cp -rp $mount_point $tmpdir + $BIN_DIR/mkdir -p $tmpdir + $BIN_DIR/dump.f2fs -rfPo $tmpdir $block_device if [ $? -ne 0 ]; then - echo "Failed to cp -rp $mount_point $tmpdir" + echo "Failed to $BIN_DIR/dump.f2fs -rfPo $tmpdir $block_device" return fi - fsync `find $tmpdir -type fd` mv $tmpdir $build_checkpoint if [ $? -ne 0 ]; then echo "mv $tmpdir $build_checkpoint" @@ -31,12 +31,8 @@ function copy_files_to_data() echo "Successfully copied $mount_point to $build_checkpoint" } -chmod g+rx -R /mnt/vendor/efs -chmod g+rx -R /mnt/vendor/efs_backup -chmod g+rx -R /mnt/vendor/modem_userdata copy_files_to_data "/dev/block/by-name/efs" "/mnt/vendor/efs" copy_files_to_data "/dev/block/by-name/efs_backup" "/mnt/vendor/efs_backup" copy_files_to_data "/dev/block/by-name/modem_userdata" "/mnt/vendor/modem_userdata" -chmod g+rx -R /mnt/vendor/persist copy_files_to_data "/dev/block/by-name/persist" "/mnt/vendor/persist" diff --git a/device.mk b/device.mk index bcf96249..8d705f32 100644 --- a/device.mk +++ b/device.mk @@ -366,6 +366,7 @@ PRODUCT_COPY_FILES += \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.efs.from_data:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs.from_data \ PRODUCT_PACKAGES += copy_efs_files_to_data +PRODUCT_PACKAGES += fsck.f2fs.vendor else PRODUCT_COPY_FILES += \ device/google/zuma/conf/init.efs.4k.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.efs.rc From e2155d5cc4a5e3df8073deae19a35282cba6f83f Mon Sep 17 00:00:00 2001 From: Utku Utkan Date: Wed, 5 Jun 2024 04:51:09 +0000 Subject: [PATCH 7/9] Remove ACCESS_FINE_LOCATION permission pregrant for PCS on Zuma FLAG: EXEMPT Cleanup of obsolete permission pregrant Bug: 345021501 Test: m && flashall Change-Id: Ia59acea79baadb45083adc76f52d62a0fb184762 --- default-permissions.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/default-permissions.xml b/default-permissions.xml index 1764bc1a..00959c8f 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -59,7 +59,6 @@ - From 1f43d128df1b4247c8979e06f4cd4e61edc64f82 Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Wed, 5 Jun 2024 12:10:50 +0800 Subject: [PATCH 8/9] Make SUPPORT_MULTI_SIM recognizable in bp This commit establishes a soong config variable `sim_count` for easier converting Android.mk to Android.bp when dealing with multiple SIMs. Bug: 343823190 Test: presubmit Change-Id: I93d355e30771868f1c4664eebbce579e1e37cdcb --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index d2fe0a0b..ebc305e9 100644 --- a/device.mk +++ b/device.mk @@ -931,7 +931,9 @@ PRODUCT_PACKAGES += \ # Exynos RIL and telephony # Multi SIM(DSDS) SIM_COUNT := 2 +$(call soong_config_set,sim,sim_count,$(SIM_COUNT)) SUPPORT_MULTI_SIM := true + # Support NR SUPPORT_NR := true # Support 5G on both stacks From 1b3d66a9fbc3ff931acab5caec3ad84d618be3ac Mon Sep 17 00:00:00 2001 From: Dennis Shen Date: Fri, 7 Jun 2024 13:07:42 +0000 Subject: [PATCH 9/9] switch over to use new storage read api instead of server_configurable_flags, this new read api lib will be needed for new codegened aconfig flag lib. Bug: 321077378 Test m and avd Change-Id: I99307a4ad8f133232cfd8b47058f936445cb7cce --- usb/usb/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp index 858fc472..be45393f 100644 --- a/usb/usb/Android.bp +++ b/usb/usb/Android.bp @@ -55,6 +55,7 @@ cc_binary { "libbinder_ndk", "libprotobuf-cpp-lite", "server_configurable_flags", + "libaconfig_storage_read_api_cc", ], static_libs: [ "libpixelusb-aidl",