From 66b1565ce2d7fd78b94f7bde988f58e27b64639a Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Thu, 25 Jan 2024 21:35:37 +0000 Subject: [PATCH 1/5] 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/5] 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/5] 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/5] 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/5] 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