From ecef8c5764a2a3e506ea1bd4f84d93ea13225610 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 30 Jan 2024 10:06:29 +0000 Subject: [PATCH 01/29] gs201: upgrade IDisplay to V11 Bug: 307787644 Test: build pass Change-Id: Ia845a41693fb33748425b8ac753c665b8f85d954 --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index b3d37877..9350dbfd 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -78,7 +78,7 @@ com.google.hardware.pixel.display - 10 + 11 IDisplay default From 9a1ff5f8041e4532481a1f7c6c168965d813fc53 Mon Sep 17 00:00:00 2001 From: Spade Lee Date: Wed, 13 Mar 2024 02:08:34 +0000 Subject: [PATCH 02/29] pixelstats: gs201: add history validation path Bug: 329174074 Change-Id: I8830d4a7532d8900abdcf78ba7ab1c141b47c1b4 Signed-off-by: Spade Lee --- pixelstats/service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index 6e84fe55..592bf2d6 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -100,7 +100,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { "/sys/class/power_supply/maxfg/m5_model_state", "/sys/class/power_supply/maxfg_base/m5_model_state" }, - .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count" + .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count", + .FGLogBufferPath = "/dev/logbuffer_maxfg_monitor" }; const struct UeventListener::UeventPaths ueventPaths = { From a929e8bc02a747e418b3b5e890f3d892c4ed14cb Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Wed, 28 Feb 2024 14:42:39 +0000 Subject: [PATCH 03/29] Enable Secretkeeper HAL service on gs201 The prebuilts on `main` have been updated to include: - the Secretkeeper TA in Trusty (in ab/11346410) - the ABL changes to retrieve the Secretkeeper identity pub key. for the relevant devices: - pantah (http://ag/26396674 to Trusty ab/11498491) - felix (http://ag/26385511 to Trusty ab/11498491) - lynx (http://ag/26395689 to Trusty ab/11498491) - tangorpro (http://ag/26396492 to Trusty ab/11498491) So enable the corresponding HAL service for Secretkeeper when the relevant build flag is enabled. Bug: 291228655 Bug: 306364873 Test: VtsSecretkeeperTargetTest on cheetah Change-Id: I42804579ab4ff5a8ac0edd48fead8631f580dc37 --- device.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index f8f116b7..3cf89d31 100644 --- a/device.mk +++ b/device.mk @@ -82,6 +82,11 @@ PRODUCT_SOONG_NAMESPACES += \ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 +ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true) + # Set the environment variable to enable the Secretkeeper HAL service. + SECRETKEEPER_ENABLED := true +endif + # OEM Unlock reporting PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 @@ -249,7 +254,7 @@ PRODUCT_PACKAGES += \ PRODUCT_VENDOR_PROPERTIES += \ vendor.mali.platform.config=/vendor/etc/mali/platform.config \ vendor.mali.debug.config=/vendor/etc/mali/debug.config \ - vendor.mali.base_protected_max_core_count=1 \ + vendor.mali.base_protected_max_core_count=1 \ vendor.mali.base_protected_tls_max=67108864 \ vendor.mali.platform_agt_frequency_khz=24576 From 9922a0fc126053a5fbbff13a576f12850e5d364b Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Mon, 25 Mar 2024 16:34:05 +0000 Subject: [PATCH 04/29] Revert "Enable Secretkeeper HAL service on gs201" This reverts commit a929e8bc02a747e418b3b5e890f3d892c4ed14cb. Reason for revert: disable until gs201/main prebuilts get updated The gs201/main prebuilts are a couple of weeks old, which means that some heap size fixes for the Secretkeeper TA are not present for these devices. This in turn blocks: - aosp/2997056: re-enable SK in pVMs - aosp/3000947: add large DICE chain VTS tests So revert for now, so we can submit those two CLs and have Secretkeeper test coverage happening on shusky. Then when gs201/main prebuilts are updated to something more recent (i.e. that includes aosp/3005090), we can re-enable the HAL service. Bug: 291228655 Bug: 306364873 Change-Id: I543310092ad6430a2dee30ae0b950fadbe869e15 --- device.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/device.mk b/device.mk index 3cf89d31..f8f116b7 100644 --- a/device.mk +++ b/device.mk @@ -82,11 +82,6 @@ PRODUCT_SOONG_NAMESPACES += \ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 -ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true) - # Set the environment variable to enable the Secretkeeper HAL service. - SECRETKEEPER_ENABLED := true -endif - # OEM Unlock reporting PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 @@ -254,7 +249,7 @@ PRODUCT_PACKAGES += \ PRODUCT_VENDOR_PROPERTIES += \ vendor.mali.platform.config=/vendor/etc/mali/platform.config \ vendor.mali.debug.config=/vendor/etc/mali/debug.config \ - vendor.mali.base_protected_max_core_count=1 \ + vendor.mali.base_protected_max_core_count=1 \ vendor.mali.base_protected_tls_max=67108864 \ vendor.mali.platform_agt_frequency_khz=24576 From 6008aad40e7840478defc037b121613cf51ad0f1 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Thu, 14 Mar 2024 10:48:38 +0800 Subject: [PATCH 05/29] Update SOONG_NAMESPACES to include power-anomaly-sitril folder Bug: 326175117 Test: 1. lunch lynx-trunk_staging-userdebug 2. m PowerAnomalySitril Change-Id: I97eb94f85ae2ab164fe0fc6b9d3429ebca5b0db5 --- device.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device.mk b/device.mk index f8f116b7..ebda9868 100644 --- a/device.mk +++ b/device.mk @@ -202,6 +202,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ telephony.active_modems.max_count=2 USE_LASSEN_OEMHOOK := true +# The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when +# $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. +ifneq ($(BOARD_WITHOUT_RADIO),true) + PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril +endif # Use for GRIL USES_LASSEN_MODEM := true From f1558f0cc85870019ba73bce18f721881a0adb95 Mon Sep 17 00:00:00 2001 From: Ziyi Yang Date: Sat, 30 Mar 2024 00:03:04 +0000 Subject: [PATCH 06/29] Adding post notification to gca default permissions Bug: 331677590 Test: Build and flash. Permission was pregranted to gca. Change-Id: Id38a1cfebaed37fe82f01c4116967a867e026309 --- default-permissions.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index e9a65436..d8dc57a1 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -41,6 +41,10 @@ --> + + + + From cf16a40663f51d21c4798c3e9a0c7613625a145a Mon Sep 17 00:00:00 2001 From: Dinesh Yadav Date: Fri, 5 Apr 2024 05:05:05 +0000 Subject: [PATCH 07/29] TPU Janeiro Tachyon Migration This change includes tachyon targets for edgetpu in the final image TESTED: Create a private build with this change and verified that the tachyon targets were present after flashing on a local device. Bug: 307591410 Change-Id: Id584ee4ad626e28b7093e6df9a14c3e19dbe51ea --- device.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index ebda9868..e46284b9 100644 --- a/device.mk +++ b/device.mk @@ -1071,7 +1071,9 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google_devices/gs201/proprietary/gchips/tpu/darwinn_logging_service \ vendor/google_devices/gs201/proprietary/gchips/tpu/nnapi_stable_aidl \ vendor/google_devices/gs201/proprietary/gchips/tpu/aidl \ - vendor/google_devices/gs201/proprietary/gchips/tpu/hal + vendor/google_devices/gs201/proprietary/gchips/tpu/hal \ + vendor/google_devices/gs201/proprietary/gchips/tpu/tachyon/api \ + vendor/google_devices/gs201/proprietary/gchips/tpu/tachyon/service # TPU firmware PRODUCT_PACKAGES += edgetpu-janeiro.fw From fd583d1d1101be8f780bb0ff57cff5b683265358 Mon Sep 17 00:00:00 2001 From: wenchangliu Date: Mon, 1 Apr 2024 04:05:05 +0000 Subject: [PATCH 08/29] update odd resolution support in vpx and av1 codecs [VSR-4.2.004.001] MUST support the smallest width/height alignment allowed by the video standard. For AVC/HEVC/VCC, this requires 2x2 pixel alignment for YUV 4:2:0 profiles, and 2x1 pixel alignment for YUV 4:2:2 profiles. For VP8/VP9/AV1, this requires 1x1 pixel alignment for any profiles. Note: This is usually stored as the crop rectangle in the bitstream. Bug: 329378524 Test: CtsMediaV2TestCases Change-Id: I0e84a342bf1093c74c712d2c811b37eca9c7908c --- media_codecs_aosp_c2.xml | 10 +++++----- media_codecs_bo_c2.xml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml index 6846cbe3..736d043d 100644 --- a/media_codecs_aosp_c2.xml +++ b/media_codecs_aosp_c2.xml @@ -106,7 +106,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -233,7 +233,7 @@ - + diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml index 187df342..48b07e61 100644 --- a/media_codecs_bo_c2.xml +++ b/media_codecs_bo_c2.xml @@ -19,7 +19,7 @@ - + @@ -34,7 +34,7 @@ - + From 1ae8911a2b7444aea0eb1e30564fb67c8bfef661 Mon Sep 17 00:00:00 2001 From: Enzo Liao Date: Mon, 18 Mar 2024 22:33:34 +0800 Subject: [PATCH 09/29] Apply common SELinux policies related to ramdumps and coredumps to gs201. Refer: ag/26620507 Bug: 298102808 Design: go/sys-software-logging Test: Manual Change-Id: If0f1f42dfe074bdc211e538f0aa4eb7e7494abe0 --- device.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/device.mk b/device.mk index e46284b9..d4f25be1 100644 --- a/device.mk +++ b/device.mk @@ -16,7 +16,7 @@ include device/google/gs-common/device.mk include device/google/gs-common/gs_watchdogd/watchdog.mk -include device/google/gs-common/ramdump/ramdump.mk +include device/google/gs-common/ramdump_and_coredump/ramdump_and_coredump.mk include device/google/gs-common/soc/soc.mk include device/google/gs-common/soc/freq.mk include device/google/gs-common/modem/modem.mk @@ -1121,9 +1121,6 @@ include hardware/google/pixel/common/pixel-common-device.mk # Pixel Logger include hardware/google/pixel/PixelLogger/PixelLogger.mk -# sscoredump -include hardware/google/pixel/sscoredump/device.mk - # RadioExt Version USES_RADIOEXT_V1_5 = true From 1bd83d81704f8fe92fd21dbe7825884bedd8930b Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Tue, 5 Mar 2024 00:55:40 +0000 Subject: [PATCH 10/29] Revert "Add betterbug mk to gs201" Revert submission 26348985-bb-sepolicy-poc Reason for revert: Droidfood blocking bug: b/327991669 Bug: 327991669 Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3f5c12abada31befa0d9f869bf6628d06ee05aa4) Merged-In: Id77188dd9f6f5acaed1506a9489f5d6f9874dde9 Change-Id: Id77188dd9f6f5acaed1506a9489f5d6f9874dde9 24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev. --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 0aa5bd6c..42b007a1 100644 --- a/device.mk +++ b/device.mk @@ -37,7 +37,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 ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif From 5e7a737f119f41fd506c696a1507e1438047e247 Mon Sep 17 00:00:00 2001 From: Hongyang Jiao Date: Tue, 5 Mar 2024 23:27:27 +0000 Subject: [PATCH 11/29] Add betterbug.mk to gs201 Test: manual test Bug: 322543833 Change-Id: Ie1b8157c8687bc4ec9bb00feb47cbcc130d59ee0 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 42b007a1..0aa5bd6c 100644 --- a/device.mk +++ b/device.mk @@ -37,6 +37,7 @@ 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 ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif From 355b8bd76db2c07b7d87efbb3a512fd4410fa8ae Mon Sep 17 00:00:00 2001 From: Shashwat Razdan Date: Thu, 28 Mar 2024 18:59:22 +0000 Subject: [PATCH 12/29] Revert "Adding android.software.contextualsearch to gs-201 devices." Revert submission 26467635-feature_cs Reason for revert: b/329350496 - Introducing new config with `android.*` namespace is not allowed in 24Q2. Reverted changes: /q/submissionid:26467635-feature_cs Change-Id: I36c1408c09a3fa73e2958216e996a8d1e0d94487 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index d4f25be1..b39a997b 100644 --- a/device.mk +++ b/device.mk @@ -264,7 +264,6 @@ PRODUCT_COPY_FILES += \ 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.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.contextualsearch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.contextualsearch.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 ifeq ($(USE_SWIFTSHADER),true) From 9b76510c865aa0093ef3183b1539eef8763ba964 Mon Sep 17 00:00:00 2001 From: Wonsik Kim Date: Wed, 14 Feb 2024 13:27:32 -0800 Subject: [PATCH 13/29] Enable AIDL media.c2 Bug: 321808716 Test: adb shell dumpsys android.hardware.media.c2.IComponentStore/default Test: adb shell dumpsys android.hardware.media.c2.IComponentStore/default1 Change-Id: If3cd57d4ac1e04503015e7c8dd6b69ab3c9163b5 --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index b39a997b..c4fb9cb8 100644 --- a/device.mk +++ b/device.mk @@ -766,6 +766,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ debug.stagefright.c2inputsurface=-1 \ +PRODUCT_PROPERTY_OVERRIDES += media.c2.hal.selection=aidl + # 2. OpenMAX IL PRODUCT_COPY_FILES += \ device/google/gs201/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ From 9517110d2804a95f925c67c285e9ad981d686ef6 Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Fri, 19 Apr 2024 20:44:19 +0000 Subject: [PATCH 14/29] Revert "Enable AIDL media.c2" Revert submission 26384060-c2aidl-pixel-enable Reason for revert: Culprit for b/335892284. Will be verifying through ABTD for confirmation and before submitting the revert. Reverted changes: /q/submissionid:26384060-c2aidl-pixel-enable Change-Id: I4acee85037309e699e82c8f378b72381be7de316 --- device.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/device.mk b/device.mk index c4fb9cb8..b39a997b 100644 --- a/device.mk +++ b/device.mk @@ -766,8 +766,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ debug.stagefright.c2inputsurface=-1 \ -PRODUCT_PROPERTY_OVERRIDES += media.c2.hal.selection=aidl - # 2. OpenMAX IL PRODUCT_COPY_FILES += \ device/google/gs201/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ From 396792798c7392b78dae868d13b568ad1e9ccf44 Mon Sep 17 00:00:00 2001 From: Sungtak Lee Date: Tue, 23 Apr 2024 08:35:19 +0000 Subject: [PATCH 15/29] Reapply "Enable AIDL media.c2" This reverts commit 9517110d2804a95f925c67c285e9ad981d686ef6. Bug: 321808716 Test: adb shell dumpsys android.hardware.media.c2.IComponentStore/default Test: adb shell dumpsys android.hardware.media.c2.IComponentStore/default1 Change-Id: If295d690134a6fb28bb865d9f7659343ef2ec50b --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index b39a997b..c4fb9cb8 100644 --- a/device.mk +++ b/device.mk @@ -766,6 +766,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ debug.stagefright.c2inputsurface=-1 \ +PRODUCT_PROPERTY_OVERRIDES += media.c2.hal.selection=aidl + # 2. OpenMAX IL PRODUCT_COPY_FILES += \ device/google/gs201/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ From 0d11a6641db189497e94b383fd4de86b9e50d529 Mon Sep 17 00:00:00 2001 From: Chungro Lee Date: Tue, 12 Mar 2024 17:25:04 +0000 Subject: [PATCH 16/29] pixelstats: move learning/model load path to sysfs Reporting learning(relaxation) and model loading once a day * learning and model loading path moved from uevent to sysfs collector. Bug: 329124192 Signed-off-by: Chungro Lee (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5dc71cfae1304564ccb2861109e9e1451032f0e7) Merged-In: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64 Change-Id: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64 --- pixelstats/service.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index 595befbe..6e84fe55 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -92,21 +92,21 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { "/sys/class/power_supply/maxfg/gmsr", "/sys/class/power_supply/maxfg_base/gmsr", }, + .FGLearningPath = { + "/sys/class/power_supply/maxfg/fg_learning_events", + "/sys/class/power_supply/maxfg_base/fg_learning_events" + }, + .FGModelLoadingPath = { + "/sys/class/power_supply/maxfg/m5_model_state", + "/sys/class/power_supply/maxfg_base/m5_model_state" + }, .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count" }; const struct UeventListener::UeventPaths ueventPaths = { .AudioUevent = "/devices/virtual/amcs/amcs", .TypeCPartnerUevent = "PRODUCT_TYPE=", - .FGLearningPath = { - "/sys/class/power_supply/maxfg/fg_learning_events", - "/sys/class/power_supply/maxfg_base/fg_learning_events" - }, - .FwUpdatePath = "", - .FGModelLoadingPath = { - "/sys/class/power_supply/maxfg/m5_model_state", - "/sys/class/power_supply/maxfg_base/m5_model_state" - } + .FwUpdatePath = "" }; int main() { From 3d06665d25b65709785122f1af2f6fe4d653f3d7 Mon Sep 17 00:00:00 2001 From: Spade Lee Date: Wed, 13 Mar 2024 02:08:34 +0000 Subject: [PATCH 17/29] pixelstats: gs201: add history validation path Bug: 329174074 Signed-off-by: Spade Lee (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9a1ff5f8041e4532481a1f7c6c168965d813fc53) Merged-In: I8830d4a7532d8900abdcf78ba7ab1c141b47c1b4 Change-Id: I8830d4a7532d8900abdcf78ba7ab1c141b47c1b4 --- pixelstats/service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index 6e84fe55..592bf2d6 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -100,7 +100,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { "/sys/class/power_supply/maxfg/m5_model_state", "/sys/class/power_supply/maxfg_base/m5_model_state" }, - .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count" + .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count", + .FGLogBufferPath = "/dev/logbuffer_maxfg_monitor" }; const struct UeventListener::UeventPaths ueventPaths = { From 0e14fcb53e77799da67c26330e97e36fbb58f2d8 Mon Sep 17 00:00:00 2001 From: Enzo Liao Date: Mon, 18 Mar 2024 22:33:34 +0800 Subject: [PATCH 18/29] Apply common SELinux policies related to ramdumps and coredumps to gs201. Refer: ag/26620507 Bug: 298102808 Design: go/sys-software-logging Test: Manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1ae8911a2b7444aea0eb1e30564fb67c8bfef661) Merged-In: If0f1f42dfe074bdc211e538f0aa4eb7e7494abe0 Change-Id: If0f1f42dfe074bdc211e538f0aa4eb7e7494abe0 --- device.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/device.mk b/device.mk index 0aa5bd6c..52054d21 100644 --- a/device.mk +++ b/device.mk @@ -16,7 +16,7 @@ include device/google/gs-common/device.mk include device/google/gs-common/gs_watchdogd/watchdog.mk -include device/google/gs-common/ramdump/ramdump.mk +include device/google/gs-common/ramdump_and_coredump/ramdump_and_coredump.mk include device/google/gs-common/soc/soc.mk include device/google/gs-common/soc/freq.mk include device/google/gs-common/modem/modem.mk @@ -1118,9 +1118,6 @@ include hardware/google/pixel/common/pixel-common-device.mk # Pixel Logger include hardware/google/pixel/PixelLogger/PixelLogger.mk -# sscoredump -include hardware/google/pixel/sscoredump/device.mk - # RadioExt Version USES_RADIOEXT_V1_5 = true From 3ed14a059f9ea9ec9fbdf1219e23772f75ed7d47 Mon Sep 17 00:00:00 2001 From: Spade Lee Date: Mon, 22 Apr 2024 18:43:42 +0000 Subject: [PATCH 19/29] pixelstats: gs201: add all logbuffer paths Bug: 335934710 Change-Id: I20c24578a1e6ed08ad27cd9f4d37a55338ee8f73 Signed-off-by: Spade Lee --- pixelstats/service.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index 592bf2d6..270a70af 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -92,16 +92,17 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { "/sys/class/power_supply/maxfg/gmsr", "/sys/class/power_supply/maxfg_base/gmsr", }, - .FGLearningPath = { - "/sys/class/power_supply/maxfg/fg_learning_events", - "/sys/class/power_supply/maxfg_base/fg_learning_events" - }, .FGModelLoadingPath = { "/sys/class/power_supply/maxfg/m5_model_state", "/sys/class/power_supply/maxfg_base/m5_model_state" }, - .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count", - .FGLogBufferPath = "/dev/logbuffer_maxfg_monitor" + .FGLogBufferPath = { + "/dev/logbuffer_maxfg_monitor", + "/dev/logbuffer_max77779fg_monitor", + "/dev/logbuffer_maxfg_base_monitor", + "/dev/logbuffer_maxfg_secondary_monitor" + }, + .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count" }; const struct UeventListener::UeventPaths ueventPaths = { From a140670b7a68f61fb1df3927a2f0b6a5c654a1fe Mon Sep 17 00:00:00 2001 From: Qian-Hao Huang Date: Tue, 23 Apr 2024 23:33:06 +0800 Subject: [PATCH 20/29] gs201: Change the path of prebuilt fips140.ko Placing the fips140.ko at the same level as other kernel modules makes it easier for automation tools to handle all of them. Bug: 331791671 Change-Id: I7d69226d594fe068a6ccb99bb5a29620468f4aed Signed-off-by: Qian-Hao Huang --- BoardConfig-common.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 2eab1573..48d30a44 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -387,9 +387,8 @@ endif BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist # Prebuilt kernel modules that are *not* listed in vendor_kernel_boot.modules.load -BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES = fips140/fips140.ko +BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES = fips140.ko BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k))) -KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA)) # Kernel modules that are listed in vendor_kernel_boot.modules.load BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load)) From 6cef6b07d18864844c4e0d9c92c0b1bba292a265 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Fri, 12 Apr 2024 11:00:16 +0800 Subject: [PATCH 21/29] Update USES_LASSEN_MODEM soong config settings for aosp projects. Add the flag "use_lassen_modem" for bp to do the same checking like "USES_LASSEN_MODEM" in mk. Bug: 330654744 Test: 1. lunch aosp_cheetah-trunk_staging-userdebug 2. m RilConfigService Change-Id: Icb99b639837237b2afeea858de14669d583bf385 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index d15c21d4..c11e291f 100644 --- a/device.mk +++ b/device.mk @@ -201,6 +201,7 @@ USE_LASSEN_OEMHOOK := true # Use for GRIL USES_LASSEN_MODEM := true +$(call soong_config_set, vendor_ril_google_feature, use_lassen_modem, true) ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true) USE_GOOGLE_DIALER := true From a7a56a898ef10c8a9bf4d010e2a2f395289d6138 Mon Sep 17 00:00:00 2001 From: SaiChand Duppala Date: Mon, 29 Apr 2024 14:27:23 -0700 Subject: [PATCH 22/29] Disable dumpstate strict-run flag in gs201 The change disables the dumpstate strict-run flag in gs201 devices, which is enabled by default. Disabling this flag increases the timeout for capturing incident report to 120 seconds, from the default 20 seconds. This is done because 20s isn't enough to capture incident report proto in some cases, especially when device is throttling. Bug: 330400782 Test: Booted a gs201 device with the change. Then manually thermal throttled the device and captured bugreports. In some tests Incident report took a lot more more than 20s, and in all these cases it was succesfully captured. Change-Id: I177bd4aebc550ade855a8abf46ce261eea94d352 --- device.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/device.mk b/device.mk index 2d9949c0..8373599f 100644 --- a/device.mk +++ b/device.mk @@ -1163,3 +1163,10 @@ PRODUCT_PACKAGES += ufs_firmware_update.sh # Touch service include device/google/gs-common/touch/twoshay/aidl_gs101.mk include device/google/gs-common/touch/twoshay/twoshay.mk + + +# Allow longer timeout for incident report generation in bugreport +# Overriding in /product partition instead of /vendor intentionally, +# since it can't be overridden from /vendor. +PRODUCT_PRODUCT_PROPERTIES += \ + dumpstate.strict_run=false From 3cabae8619ebae3c217651c1575975a14347010b Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Wed, 8 May 2024 08:40:39 +0000 Subject: [PATCH 23/29] Update IDisplay to V11-V12 V12 is not frozen yet. We should still allow V11 for `next` build. Test: trigger test build Bug: 309897479 Bug: 303162192 Change-Id: Iea9df905efd6bf131d178dcb483e76a0f9d58a14 Signed-off-by: Leo Chen --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 9350dbfd..12755762 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -78,7 +78,7 @@ com.google.hardware.pixel.display - 11 + 11-12 IDisplay default From 03c2cdb7ae2193cf7e0b6a2988f58dd3501dde51 Mon Sep 17 00:00:00 2001 From: Edgar Arriaga Date: Thu, 9 May 2024 23:56:52 +0000 Subject: [PATCH 24/29] Set default pin amount for home app Bug: 288900050 Test: dumpsys pinner Flag: EXEMPT refactor Change-Id: Ieed912786ce51f420da9b0e96ea5d93c22244176 --- overlay/frameworks/base/core/res/res/values/config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index f594fc6d..d266ccd3 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -249,8 +249,8 @@ true - - true + + 6291456 20971520 From 23691f7a02b2aad8a766c61bd9b2bd10a1d517c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Wagner?= Date: Sat, 2 Mar 2024 14:09:22 +0000 Subject: [PATCH 25/29] Use 2024-03-01 deqp levels for GLES and Vulkan Bug: 327589279 Change-Id: I68aa5d2ee438739c80f2e7b3e54ad96f435d515a --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 8373599f..d291af4c 100644 --- a/device.mk +++ b/device.mk @@ -264,8 +264,8 @@ 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.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 + frameworks/native/data/etc/android.software.vulkan.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ + frameworks/native/data/etc/android.software.opengles.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml ifeq ($(USE_SWIFTSHADER),true) PRODUCT_PACKAGES += \ From a75c6750da46f0cfcb0b4b0c2b4c24747629d698 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Tue, 14 May 2024 09:25:05 +0000 Subject: [PATCH 26/29] gs201: update performance point based on AP3A.240513.001 Bug: 335350051 Test: CtsMediaDecoderTestCases android.media.decoder.cts.VideoDecoderPerfTest Change-Id: I06abe0d6d2387792a1492a4fd551549ca3bdfa49 --- media_codecs_performance_c2.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index 0f7c377a..f84e518a 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -117,24 +117,24 @@ - + - + - + - + - + - + - + - + - + From 17975d9a6b099310f3f85f1a456dd1afcc1fd9d7 Mon Sep 17 00:00:00 2001 From: Sungtak Lee Date: Thu, 16 May 2024 21:30:42 +0000 Subject: [PATCH 27/29] Remove codec2 hidl fragments Bug: 321808716 Change-Id: Ibf440b28881e2e51e142299bd07ba2e19322883e --- manifest_media.xml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/manifest_media.xml b/manifest_media.xml index b29c7f2f..18588a69 100644 --- a/manifest_media.xml +++ b/manifest_media.xml @@ -1,23 +1,4 @@ - - - android.hardware.media.c2 - hwbinder - 1.0 - - IComponentStore - default1 - - - - android.hardware.media.c2 - hwbinder - 1.2 - - IComponentStore - default - - android.hardware.media.c2 From 702e14bdcf816bf6be42ca878e92cbe2c8d609bf Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 29 May 2024 10:00:19 +0000 Subject: [PATCH 28/29] Switch makefile owners to MK_OWNERS Bug: 278167548 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e72b281d89f769d2cf5000538cd6e9f3793b983c) Merged-In: I6259f2fb9e561ce0ee5a61c9b6abbb745ace9d25 Change-Id: I6259f2fb9e561ce0ee5a61c9b6abbb745ace9d25 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 4bdbb973..e6ce5d01 100644 --- a/OWNERS +++ b/OWNERS @@ -1,2 +1,2 @@ # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk=file:device/google/gs-common:main:/OWNERS +per-file *.mk=file:device/google/gs-common:main:/MK_OWNERS From 2a0c178a14ec39dd4fc7a74082746c5e263d514a Mon Sep 17 00:00:00 2001 From: jiangzining Date: Thu, 30 May 2024 15:22:33 +0800 Subject: [PATCH 29/29] [Scone] add BLUETOOTH_CONNECT to SCONE default permission MBA Approval: b/330640278 Bug: b/343608940 Test: Build and Flash Change-Id: I5fd9306599e58e9adb51aeea62b5de11c9147217 --- default-permissions.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index d8dc57a1..a6476338 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -80,6 +80,8 @@ + +