From f2d819644167803add0479a9add27b0b894ef43b Mon Sep 17 00:00:00 2001 From: Devika Krishnadas Date: Mon, 26 Feb 2024 17:58:11 +0000 Subject: [PATCH 01/52] Move Gralloc packages to gs-common Bug: 275906497 Test: Boot succeeds Change-Id: I879a5ef8365abe018c501cdb0b06c9753e0e5902 Signed-off-by: Devika Krishnadas --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index 9edf65e8..39f6bbdb 100644 --- a/device.mk +++ b/device.mk @@ -508,10 +508,6 @@ PRODUCT_PACKAGES += \ com.android.future.usb.accessory # for now include gralloc here. should come from hardware/google_devices/exynos5 -PRODUCT_PACKAGES += \ - android.hardware.graphics.mapper@4.0-impl \ - android.hardware.graphics.allocator-V1-service - PRODUCT_PACKAGES += \ android.hardware.memtrack-service.pixel \ libion_exynos \ From 9ad27501e4fd196b6ec9c2a3eec27c5e6e585717 Mon Sep 17 00:00:00 2001 From: Mark Chang Date: Fri, 1 Mar 2024 12:02:34 +0000 Subject: [PATCH 02/52] Add sepolicy include to gs101. Bug: 325422902 Test: Manual, system booted without sepolicy denied error. Change-Id: I2149188a925cc94aea077e9b6fb78cc850660dd7 Signed-off-by: Mark Chang --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 39f6bbdb..69ef69f0 100644 --- a/device.mk +++ b/device.mk @@ -1113,3 +1113,4 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk # Touch service include device/google/gs-common/touch/twoshay/aidl_gs101.mk +include device/google/gs-common/touch/twoshay/twoshay.mk From def43cc017a9abb719b2dcf153fa4b2f05d7eaa0 Mon Sep 17 00:00:00 2001 From: Wonsik Kim Date: Fri, 26 Jan 2024 15:57:28 -0800 Subject: [PATCH 03/52] Add AIDL media.c2 fragments Bug: 321808716 Test: adb shell dumpsys android.hardware.media.c2.IComponentStore/default Test: adb shell dumpsys android.hardware.media.c2.IComponentStore/default1 Change-Id: I3a0a38f71421a8673038f63764250f7a1a88c730 --- manifest_media.xml | 10 ++++++++++ manifest_media_aosp.xml | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/manifest_media.xml b/manifest_media.xml index 38e56ba2..329dd2d4 100644 --- a/manifest_media.xml +++ b/manifest_media.xml @@ -17,4 +17,14 @@ default + + android.hardware.media.c2 + 1 + IComponentStore/default1 + + + android.hardware.media.c2 + 1 + IComponentStore/default + diff --git a/manifest_media_aosp.xml b/manifest_media_aosp.xml index 9a1a3dba..d92e4a28 100644 --- a/manifest_media_aosp.xml +++ b/manifest_media_aosp.xml @@ -8,4 +8,9 @@ default + + android.hardware.media.c2 + 1 + IComponentStore/default + From 3c31047ecf2ce2c9c8e0bbf6c59f79d18135e6af Mon Sep 17 00:00:00 2001 From: Barry Date: Tue, 5 Mar 2024 09:36:50 +0000 Subject: [PATCH 04/52] BT: set system property for Bluetooth Auto On Set bluetooth.server.automatic_turn_on true for Bluetooth Auto On feature. The feature will be enabled with both system property and flag set. Bug: 328168526 Test: check system property value Change-Id: If7e9c3bab450dead2cfd46dddc55d293ccab3d92 --- device.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device.mk b/device.mk index 69ef69f0..94d92c54 100644 --- a/device.mk +++ b/device.mk @@ -815,6 +815,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.bqr.min_interval_ms=500 endif +# Enable Bluetooth AutoOn feature +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.server.automatic_turn_on=true + #VNDK PRODUCT_PACKAGES += \ vndk-libs From a43fedce4ef60251336a86c470250b2dfb8c9f3e Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Tue, 5 Mar 2024 00:55:40 +0000 Subject: [PATCH 05/52] Revert "Add betterbug mk to gs101" 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 Change-Id: I88a445da895c373c0a53c8a2f08726582c27be77 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 94d92c54..d74516c3 100644 --- a/device.mk +++ b/device.mk @@ -36,7 +36,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 oriole raven bluejay, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif From 4ff9169f2f92191802e70fadb83810d03d2e9952 Mon Sep 17 00:00:00 2001 From: Shashwat Razdan Date: Tue, 5 Mar 2024 23:45:49 -0800 Subject: [PATCH 06/52] Adding android.software.contextualsearch to gs-101 devices. Bug: 326143814 Test: Built and tested on device Change-Id: Id45a24ec3361caade132836e5e849940efa6ac2c --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index d74516c3..182f75d1 100644 --- a/device.mk +++ b/device.mk @@ -238,6 +238,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 26a23b76dee2d5bcde50ca99b0856ec1ff34f3f9 Mon Sep 17 00:00:00 2001 From: Raphael Herouart Date: Thu, 7 Mar 2024 12:32:38 +0000 Subject: [PATCH 07/52] [Trusty] tipc-test is missing for p21. Bug: 328562462 Test: Local build Pass. Change-Id: Idb98464ef1f0a15087b124d50edb4691d39046c5 --- device.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 182f75d1..6202dd04 100644 --- a/device.mk +++ b/device.mk @@ -790,7 +790,9 @@ $(call inherit-product, system/core/trusty/trusty-base.mk) include device/google/gs-common/trusty/trusty.mk # Trusty unit test tool -PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl +PRODUCT_PACKAGES_DEBUG += \ + trusty-ut-ctrl \ + tipc-test include device/google/gs101/confirmationui/confirmationui.mk From 5fa0e12ada8ee768637a76a8b94d70cf5211f550 Mon Sep 17 00:00:00 2001 From: Limon Mia Date: Mon, 11 Mar 2024 12:27:24 +0000 Subject: [PATCH 08/52] bt: set rfkill device nodes permission setting on early_boot stage move the rfkill permission setting from post-fs-data to early_boot stage because the kernel/net/rfkill/rfkill.ko may not be loaded on post-fs-data stage and cause the permission setting failed. Bug: 277148159 Test: m Change-Id: I65f0593caddbe659528877f583917cdaead1756b --- conf/init.gs101.rc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index d0aaabe0..7185b2e1 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -829,10 +829,12 @@ on property:ro.build.fingerprint=* write /sys/module/debug_kinfo/parameters/build_info ${ro.build.fingerprint} # Bluetooth -on post-fs-data +on early-boot chown bluetooth system /sys/devices/platform/175b0000.serial/serial0/serial0-0/bluetooth/hci0/rfkill0/state chown bluetooth system /sys/devices/platform/odm/odm:btbcm/rfkill/rfkill0/state chown bluetooth system /sys/devices/platform/odm/odm:btbcm/rfkill/rfkill2/state + +on post-fs-data chown bluetooth system /proc/bluetooth/sleep/btwake chown bluetooth system /proc/bluetooth/sleep/lpm chown bluetooth system /proc/bluetooth/sleep/btwrite From e0d7a249370a93828b128cbffbab7ca9237cad90 Mon Sep 17 00:00:00 2001 From: Chungro Lee Date: Tue, 12 Mar 2024 17:34:01 +0000 Subject: [PATCH 09/52] 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 Change-Id: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64 Signed-off-by: Chungro Lee --- pixelstats/service.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index d4b803aa..5b533ceb 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -73,18 +73,18 @@ 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" + }, + .FGModelLoadingPath = { + "/sys/class/power_supply/maxfg/m5_model_state" + } }; const struct UeventListener::UeventPaths ueventPaths = { .AudioUevent = "/devices/virtual/amcs/amcs", .TypeCPartnerUevent = "PRODUCT_TYPE=", - .FGLearningPath = { - "/sys/class/power_supply/maxfg/fg_learning_events" - }, - .FwUpdatePath = "", - .FGModelLoadingPath = { - "/sys/class/power_supply/maxfg/m5_model_state" - } + .FwUpdatePath = "" }; int main() { From 5e69a4432a410714d3c47d7cfe96b6378e5759cc Mon Sep 17 00:00:00 2001 From: Hongyang Jiao Date: Tue, 5 Mar 2024 23:24:05 +0000 Subject: [PATCH 10/52] Add betterbug.mk to gs101 Test: manual test Bug: 322543833 Change-Id: Iccf4ceabd1c994b804de9e74b50fa8a0ca936af6 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 6202dd04..b3723483 100644 --- a/device.mk +++ b/device.mk @@ -36,6 +36,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 oriole raven bluejay, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif From 4bb66fedc8a6f138be1c6ba4bc4ed1cd6b044884 Mon Sep 17 00:00:00 2001 From: Shashwat Razdan Date: Tue, 5 Mar 2024 23:45:49 -0800 Subject: [PATCH 11/52] Adding android.software.contextualsearch to gs-101 devices. Bug: 326143814 Test: Built and tested on device (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ff9169f2f92191802e70fadb83810d03d2e9952) Merged-In: Id45a24ec3361caade132836e5e849940efa6ac2c Change-Id: Id45a24ec3361caade132836e5e849940efa6ac2c CP feature CLs to 24d1-dev --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 9edf65e8..4df284d1 100644 --- a/device.mk +++ b/device.mk @@ -239,6 +239,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 ea4d3ad582351bb438aae92889c87d178ccf0704 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 30 Jan 2024 10:04:36 +0000 Subject: [PATCH 12/52] gs101: upgrade IDisplay to V11 Bug: 307787644 Test: build pass Change-Id: I7d7bd95b04483afde0f53127c896e62f53a78116 --- 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 e365bbb0..00ca0c68 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 d1dd07e04daf761735c95c4a2e14c108bf1dbcf1 Mon Sep 17 00:00:00 2001 From: Spade Lee Date: Wed, 13 Mar 2024 02:12:02 +0000 Subject: [PATCH 13/52] pixelstats: gs101: add history validation path Bug: 329174074 Change-Id: I1982b772e59df66d143899086450c1e5a807f85a 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 5b533ceb..b83b62a3 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -78,7 +78,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { }, .FGModelLoadingPath = { "/sys/class/power_supply/maxfg/m5_model_state" - } + }, + .FGLogBufferPath = "/dev/logbuffer_maxfg_monitor" }; const struct UeventListener::UeventPaths ueventPaths = { From 462a14e19da4da269e4c07770a7c5bffc23db8c3 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Thu, 14 Mar 2024 10:30:21 +0800 Subject: [PATCH 14/52] Update SOONG_NAMESPACES to include power-anomaly-sitril folder Bug: 326175117 Test: 1. lunch raven-trunk_staging-userdebug 2. m PowerAnomalySitril Change-Id: I1599390860676ed2ec334e69e6b4c417ecca6095 --- device.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device.mk b/device.mk index b3723483..753a4bb9 100644 --- a/device.mk +++ b/device.mk @@ -180,6 +180,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 a41785042d5497ec119e38cb7708ce1fb5de39cb Mon Sep 17 00:00:00 2001 From: Gina Ko Date: Tue, 26 Mar 2024 18:10:50 -0700 Subject: [PATCH 15/52] gs101: Relax BOARD_SUPER_PARTITION_ERROR_LIMIT by 100MB To allow coverage builds to build Bug: 331488086 Test: TH Change-Id: I063c31704a5390091016e778f6748db8eba1261d --- BoardConfig-common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 2fdbc7ff..1ba0c264 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -185,8 +185,8 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \ vendor \ vendor_dlkm -# Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB -BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336 +# Set error limit to BOARD_SUPER_PARTITON_SIZE - 400MB +BOARD_SUPER_PARTITION_ERROR_LIMIT := 8111783936 # Testing related defines BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/r4o6-setup.sh From c71b017d9d00d8f978ed469932dfe509ab086eec Mon Sep 17 00:00:00 2001 From: Ziyi Yang Date: Sat, 30 Mar 2024 00:01:17 +0000 Subject: [PATCH 16/52] Adding post notification to gca default permissions Bug: 331677590 Test: Build and flash. Permission was pregranted to gca. Change-Id: I4f217ecf1cd3b360b7ab261c2dd5c09d9756a5b8 --- default-permissions.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index fb5ed945..63ef14cc 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -51,6 +51,10 @@ + + + + From fbf009b886cb6391b0833ab147a18c4cf9adda0d Mon Sep 17 00:00:00 2001 From: Seungah Lim Date: Tue, 26 Mar 2024 08:11:44 +0000 Subject: [PATCH 17/52] [packetrouter] Add oem-iptables-init.sh to artifact path allowed list In order to apply user-defined chain from vendor by using oem-iptables-init.ch, shell script path is added to PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST. Bug: 312772796 Signed-off-by: Seungah Lim (cherry picked from https://partner-android-review.googlesource.com/q/commit:83a119d7b7102319f7cb5d5015c8f01963ee7cf7) Merged-In: If1b57f985284561f537c1124cd60fe91215f5adc Change-Id: If1b57f985284561f537c1124cd60fe91215f5adc --- telephony/pktrouter.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/telephony/pktrouter.mk b/telephony/pktrouter.mk index dd923b59..7af34224 100644 --- a/telephony/pktrouter.mk +++ b/telephony/pktrouter.mk @@ -1,3 +1,5 @@ PRODUCT_PACKAGES += wfc-pkt-router PRODUCT_PROPERTY_OVERRIDES += vendor.pktrouter=1 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/telephony/pktrouter +PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ + $(TARGET_COPY_OUT_SYSTEM)/bin/oem-iptables-init.sh From 333cdc16631f4a7402290580d1374c23c2fbd54c Mon Sep 17 00:00:00 2001 From: Dinesh Yadav Date: Fri, 5 Apr 2024 05:33:30 +0000 Subject: [PATCH 18/52] TPU Abrolhos 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: I0894b8830cb62801c659a9b4d4f7a1ae6d851795 --- device.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 753a4bb9..ce5dcec8 100644 --- a/device.mk +++ b/device.mk @@ -1032,7 +1032,9 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google_devices/gs101/proprietary/gchips/tpu/darwinn_logging_service \ vendor/google_devices/gs101/proprietary/gchips/tpu/nnapi_stable_aidl \ vendor/google_devices/gs101/proprietary/gchips/tpu/aidl \ - vendor/google_devices/gs101/proprietary/gchips/tpu/hal + vendor/google_devices/gs101/proprietary/gchips/tpu/hal \ + vendor/google_devices/gs101/proprietary/gchips/tpu/tachyon/api \ + vendor/google_devices/gs101/proprietary/gchips/tpu/tachyon/service # TPU firmware PRODUCT_PACKAGES += edgetpu-abrolhos.fw From a4ce888b940bf27c9f3c07930365aad318377378 Mon Sep 17 00:00:00 2001 From: Ziyi Yang Date: Mon, 8 Apr 2024 06:51:52 +0000 Subject: [PATCH 19/52] Revert "Adding post notification to gca default permissions" This reverts commit c71b017d9d00d8f978ed469932dfe509ab086eec. Reason for revert: b/332797378 causing memory regression on oriole/raven Bug: 331677590 Bug: 332797378 Change-Id: If215c02641de9f3ed497d4d7043a3257c1737d9a --- default-permissions.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/default-permissions.xml b/default-permissions.xml index 63ef14cc..fb5ed945 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -51,10 +51,6 @@ - - - - From a71e7d1dccbabbede739ee9cf99be67f25ec1cfc Mon Sep 17 00:00:00 2001 From: wenchangliu Date: Mon, 1 Apr 2024 04:05:05 +0000 Subject: [PATCH 20/52] 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 cddd6177..534c5f4a 100644 --- a/media_codecs_aosp_c2.xml +++ b/media_codecs_aosp_c2.xml @@ -100,7 +100,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -218,7 +218,7 @@ - + diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml index 40c81ff1..7dd10432 100644 --- a/media_codecs_bo_c2.xml +++ b/media_codecs_bo_c2.xml @@ -19,7 +19,7 @@ - + @@ -34,7 +34,7 @@ - + From 98d7af4bf7db86523f85c05f4b5d4bc8dc6dc6a0 Mon Sep 17 00:00:00 2001 From: Enzo Liao Date: Mon, 18 Mar 2024 22:27:39 +0800 Subject: [PATCH 21/52] Apply common SELinux policies related to ramdumps and coredumps to gs101. Refer: ag/26620507 Bug: 298102808 Design: go/sys-software-logging Test: Manual Change-Id: Ic465edc3914f2815b3696f7b1c7e3475bcbc2acc --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index ce5dcec8..14a0fbc4 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 From b234a074ba847eb49ce3e535434bae3550761ab5 Mon Sep 17 00:00:00 2001 From: Barry Date: Thu, 11 Apr 2024 15:15:40 +0000 Subject: [PATCH 22/52] [Bluetooth] Disable BT auto on feature Set bluetooth.server.automatic_turn_on false for disable Bluetooth Auto On feature Bug: 333830114 Test: make Change-Id: Idcb80dad26f3a1bf928be9f83fd328712ca71a78 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 14a0fbc4..5328e94a 100644 --- a/device.mk +++ b/device.mk @@ -825,7 +825,7 @@ endif # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=true + bluetooth.server.automatic_turn_on=false #VNDK PRODUCT_PACKAGES += \ From b58ea3f8458870cad9d23c6a5d1782a53ed33a4c Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Fri, 22 Mar 2024 21:00:04 +0800 Subject: [PATCH 23/52] Update health AIDL HAL to V3 Bug: 328332299 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:f143d6803bd64b123306788e4e02670a829c3258) Merged-In: I57ff2ec2758f965a9e13e53f223c735a9d102219 Change-Id: I57ff2ec2758f965a9e13e53f223c735a9d102219 24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev. --- health/android.hardware.health-service.gs101.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/health/android.hardware.health-service.gs101.xml b/health/android.hardware.health-service.gs101.xml index 1fe9b8d2..2acaabac 100644 --- a/health/android.hardware.health-service.gs101.xml +++ b/health/android.hardware.health-service.gs101.xml @@ -1,7 +1,7 @@ android.hardware.health - 2 + 3 IHealth/default From f68e0fb440f374967cea9cee5edd8391068f3e7f Mon Sep 17 00:00:00 2001 From: isaacchiou Date: Tue, 9 Apr 2024 15:55:24 +0000 Subject: [PATCH 24/52] wifi: disable FW roaming when in idle mode When device is idle, disable FW roaming (LOW RSSI roam, high band roam) to save power Bug: 321639511 Test: Manual Change-Id: I55b88d86dffba2ccea6f8ceb608efafbc35b64d8 --- rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index 454d7f89..bba7b86a 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -167,4 +167,10 @@ If equals to 0, it means there's no limit on the max number of channels to include per network.--> 3 + + true + From 439d541d18303d31c87d193a360a380427b7262f Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Tue, 5 Mar 2024 00:55:40 +0000 Subject: [PATCH 25/52] Revert "Add betterbug mk to gs101" 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:a43fedce4ef60251336a86c470250b2dfb8c9f3e) Merged-In: I88a445da895c373c0a53c8a2f08726582c27be77 Change-Id: I88a445da895c373c0a53c8a2f08726582c27be77 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 4df284d1..3f642856 100644 --- a/device.mk +++ b/device.mk @@ -36,7 +36,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 oriole raven bluejay, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif From 7b565852240477775fbc408b89189ad259716a53 Mon Sep 17 00:00:00 2001 From: Hongyang Jiao Date: Tue, 5 Mar 2024 23:24:05 +0000 Subject: [PATCH 26/52] Add betterbug.mk to gs101 Test: manual test Bug: 322543833 Change-Id: Iccf4ceabd1c994b804de9e74b50fa8a0ca936af6 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 3f642856..4df284d1 100644 --- a/device.mk +++ b/device.mk @@ -36,6 +36,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 oriole raven bluejay, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif From 53a6e73e3d4a64cfb8d9a6d46b614ed872a9066d Mon Sep 17 00:00:00 2001 From: Shashwat Razdan Date: Thu, 28 Mar 2024 18:59:22 +0000 Subject: [PATCH 27/52] Revert "Adding android.software.contextualsearch to gs-101 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: Iafa5ea79e03f2406246b8cb9478600998f93a64f --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 5328e94a..6ab57cc3 100644 --- a/device.mk +++ b/device.mk @@ -244,7 +244,6 @@ 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 44d7a915243bebe1e2380a10705a86f3cee7c017 Mon Sep 17 00:00:00 2001 From: Wonsik Kim Date: Fri, 26 Jan 2024 15:58:56 -0800 Subject: [PATCH 28/52] 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: I1285da3e7a81570effa822d17e34d07737c91a72 --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index 6ab57cc3..c8679f36 100644 --- a/device.mk +++ b/device.mk @@ -744,6 +744,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/gs101/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ From c8575dabaaed6c1fb1645d94d0bd3ea704b0c84d Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Fri, 19 Apr 2024 20:44:19 +0000 Subject: [PATCH 29/52] 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: I2f3473c028953db80791f8c2d4ff274379333fcd --- device.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/device.mk b/device.mk index c8679f36..6ab57cc3 100644 --- a/device.mk +++ b/device.mk @@ -744,8 +744,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/gs101/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ From 1dfdc56738ecd3afd4357b621293b8e42d73e87a Mon Sep 17 00:00:00 2001 From: Sungtak Lee Date: Tue, 23 Apr 2024 08:25:09 +0000 Subject: [PATCH 30/52] Reapply "Enable AIDL media.c2" This reverts commit c8575dabaaed6c1fb1645d94d0bd3ea704b0c84d. Bug: 321808716 Test: adb shell dumpsys android.hardware.media.c2.IComponentStore/default Test: adb shell dumpsys android.hardware.media.c2.IComponentStore/default1 Change-Id: I9c7cc5e03fe35af1a69f114b84be97087b3ce602 --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index 6ab57cc3..c8679f36 100644 --- a/device.mk +++ b/device.mk @@ -744,6 +744,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/gs101/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ From 8796579a5fc20dc60ba9c20574380fe5c19b5c3c Mon Sep 17 00:00:00 2001 From: SaiChand Duppala Date: Wed, 24 Apr 2024 16:11:30 -0700 Subject: [PATCH 31/52] Disable dumpstate strict-run flag in gs101 The change disables the dumpstate strict-run flag in gs101 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 gs101 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: I8c4ee4e4412c517822776a9b10bbdad7da1c1213 --- device.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/device.mk b/device.mk index c8679f36..46a301f1 100644 --- a/device.mk +++ b/device.mk @@ -1129,3 +1129,9 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk # 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 395c89ec0559a9f9b8172f3005f2ee4854f401b0 Mon Sep 17 00:00:00 2001 From: Chungro Lee Date: Tue, 12 Mar 2024 17:34:01 +0000 Subject: [PATCH 32/52] 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:e0d7a249370a93828b128cbffbab7ca9237cad90) Merged-In: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64 Change-Id: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64 --- pixelstats/service.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index d4b803aa..5b533ceb 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -73,18 +73,18 @@ 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" + }, + .FGModelLoadingPath = { + "/sys/class/power_supply/maxfg/m5_model_state" + } }; const struct UeventListener::UeventPaths ueventPaths = { .AudioUevent = "/devices/virtual/amcs/amcs", .TypeCPartnerUevent = "PRODUCT_TYPE=", - .FGLearningPath = { - "/sys/class/power_supply/maxfg/fg_learning_events" - }, - .FwUpdatePath = "", - .FGModelLoadingPath = { - "/sys/class/power_supply/maxfg/m5_model_state" - } + .FwUpdatePath = "" }; int main() { From e4c7fd25a57a85879a2cbb518c4ec2de9e530e18 Mon Sep 17 00:00:00 2001 From: Spade Lee Date: Wed, 13 Mar 2024 02:12:02 +0000 Subject: [PATCH 33/52] pixelstats: gs101: add history validation path Bug: 329174074 Signed-off-by: Spade Lee (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d1dd07e04daf761735c95c4a2e14c108bf1dbcf1) Merged-In: I1982b772e59df66d143899086450c1e5a807f85a Change-Id: I1982b772e59df66d143899086450c1e5a807f85a --- pixelstats/service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index 5b533ceb..b83b62a3 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -78,7 +78,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { }, .FGModelLoadingPath = { "/sys/class/power_supply/maxfg/m5_model_state" - } + }, + .FGLogBufferPath = "/dev/logbuffer_maxfg_monitor" }; const struct UeventListener::UeventPaths ueventPaths = { From 1463ce2e3b9ebb9cb587278518d7c0cbf92fcdaf Mon Sep 17 00:00:00 2001 From: Seungah Lim Date: Tue, 26 Mar 2024 08:11:44 +0000 Subject: [PATCH 34/52] [packetrouter] Add oem-iptables-init.sh to artifact path allowed list In order to apply user-defined chain from vendor by using oem-iptables-init.ch, shell script path is added to PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST. Bug: 312772796 Signed-off-by: Seungah Lim (cherry picked from https://partner-android-review.googlesource.com/q/commit:83a119d7b7102319f7cb5d5015c8f01963ee7cf7) Merged-In: If1b57f985284561f537c1124cd60fe91215f5adc Change-Id: If1b57f985284561f537c1124cd60fe91215f5adc (cherry picked from commit fbf009b886cb6391b0833ab147a18c4cf9adda0d) --- telephony/pktrouter.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/telephony/pktrouter.mk b/telephony/pktrouter.mk index dd923b59..7af34224 100644 --- a/telephony/pktrouter.mk +++ b/telephony/pktrouter.mk @@ -1,3 +1,5 @@ PRODUCT_PACKAGES += wfc-pkt-router PRODUCT_PROPERTY_OVERRIDES += vendor.pktrouter=1 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/telephony/pktrouter +PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ + $(TARGET_COPY_OUT_SYSTEM)/bin/oem-iptables-init.sh From e20c4f7f8d4b66f9a70361ab01d11cea8d93a8f4 Mon Sep 17 00:00:00 2001 From: Thomas Girardier Date: Thu, 25 Apr 2024 16:21:17 +0000 Subject: [PATCH 35/52] Revert "[Bluetooth] Disable BT auto on feature" Revert submission 26919210-BTAUTOOFF4389 Reason for revert: Auto On has been approved for 24Q3 Reverted changes: /q/submissionid:26919210-BTAUTOOFF4389 Change-Id: I7e817f7003ba96486791b87a6934dfd845244d17 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 46a301f1..70d42500 100644 --- a/device.mk +++ b/device.mk @@ -826,7 +826,7 @@ endif # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=false + bluetooth.server.automatic_turn_on=true #VNDK PRODUCT_PACKAGES += \ From ae8801f2a9735995761bba8445d30ce47a154c56 Mon Sep 17 00:00:00 2001 From: Enzo Liao Date: Mon, 18 Mar 2024 22:27:39 +0800 Subject: [PATCH 36/52] Apply common SELinux policies related to ramdumps and coredumps to gs101. Refer: ag/26620507 Bug: 298102808 Design: go/sys-software-logging Test: Manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:98d7af4bf7db86523f85c05f4b5d4bc8dc6dc6a0) Merged-In: Ic465edc3914f2815b3696f7b1c7e3475bcbc2acc Change-Id: Ic465edc3914f2815b3696f7b1c7e3475bcbc2acc --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 4df284d1..184ef6db 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 From a4f232b4a6ef99c6efa1414d2e7f3470199f6254 Mon Sep 17 00:00:00 2001 From: Spade Lee Date: Mon, 22 Apr 2024 18:44:42 +0000 Subject: [PATCH 37/52] pixelstats: gs101: add all logbuffer paths Bug: 335934710 Change-Id: I573317a5da547eef4cbec22822d37bfb06f910d0 Signed-off-by: Spade Lee --- pixelstats/service.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index b83b62a3..d8461466 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -73,13 +73,15 @@ 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" - }, .FGModelLoadingPath = { "/sys/class/power_supply/maxfg/m5_model_state" }, - .FGLogBufferPath = "/dev/logbuffer_maxfg_monitor" + .FGLogBufferPath = { + "/dev/logbuffer_maxfg_monitor", + "/dev/logbuffer_max77779fg_monitor", + "/dev/logbuffer_maxfg_base_monitor", + "/dev/logbuffer_maxfg_secondary_monitor" + } }; const struct UeventListener::UeventPaths ueventPaths = { From 32035fef2f8671ddc8d319f83adce33e8fe14608 Mon Sep 17 00:00:00 2001 From: Qian-Hao Huang Date: Tue, 23 Apr 2024 23:22:27 +0800 Subject: [PATCH 38/52] gs101: 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: I444a6b089f7a2a3fee097f8d7718e88eddd1b15a 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 1ba0c264..8eb91040 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -357,9 +357,8 @@ BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.m BOARD_DO_NOT_STRIP_VENDOR_MODULES := true # Prebuilt kernel modules that are *not* listed in vendor_boot.modules.load -BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140/fips140.ko +BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140.ko BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k))) -KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA)) # Kernel modules that are listed in vendor_boot.modules.load BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load)) From c5b3375835a5dcda22a26cbc79060c42cd8d00c0 Mon Sep 17 00:00:00 2001 From: Betty Zhou Date: Wed, 1 May 2024 18:22:08 +0000 Subject: [PATCH 39/52] Enable KUnit testing on raviole userdebug & eng build target. Add kunit.enable=1 to boot command line Bug: 337797668 Flag: TEST_ONLY Change-Id: I3334316c6b41e0cd1a4dd5fded32f9c3c302ee9a --- BoardConfig-common.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 8eb91040..a5e752d7 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -49,6 +49,11 @@ BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs +# Enable KUnit for userdebug and eng builds +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + BOARD_KERNEL_CMDLINE += kunit.enable=1 +endif + TARGET_NO_BOOTLOADER := true TARGET_NO_RADIOIMAGE := true BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img) From 98343e432d5b226c443c9930914aa366b3e190c6 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Wed, 8 May 2024 08:46:17 +0000 Subject: [PATCH 40/52] 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: Ie8604d00c747bf075604f3ad55c24a13c8bfe699 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 00ca0c68..de5f3b4c 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 046e5428f624f97d9f76d68750213f5f7f62d3dd Mon Sep 17 00:00:00 2001 From: Edgar Arriaga Date: Fri, 10 May 2024 00:15:48 +0000 Subject: [PATCH 41/52] Set default pin amount for home app Bug: 288900050 Test: dumpsys pinner Flag: EXEMPT refactor Change-Id: I8dfad41210df945751761586809dd0d17cf3dae8 --- 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 a32fd947..964ebf6f 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -237,8 +237,8 @@ true - - true + + 6291456 20971520 From 64a202228271de2a39fc152e76391799facc8a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Wagner?= Date: Sat, 2 Mar 2024 14:06:43 +0000 Subject: [PATCH 42/52] Use 2024-03-01 deqp levels for GLES and Vulkan Bug: 327589279 Change-Id: Ia9691ab42c7435bc2c4d5fb56bce9665f365cbd3 --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 5d3a6496..99efae41 100644 --- a/device.mk +++ b/device.mk @@ -245,8 +245,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_VENDOR_PROPERTIES += \ From 3915f2dcb0603f5b948fe825efa6452ae31135c7 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Tue, 14 May 2024 09:22:20 +0000 Subject: [PATCH 43/52] gs101: update performance point based on AP3A.240513.001 Bug: 335350051 Test: CtsMediaDecoderTestCases android.media.decoder.cts.VideoDecoderPerfTest Change-Id: I8a89fceebac637e4ddb1a09cf55d99746e480e75 --- 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 49f131f8..04daa356 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -115,20 +115,20 @@ - + - + - + - + - - - - - + + + + + From af6893a4dba40bf3c19b3f86eefa2f5f90c2c92c Mon Sep 17 00:00:00 2001 From: Sungtak Lee Date: Thu, 16 May 2024 21:17:58 +0000 Subject: [PATCH 44/52] Remove codec2 hidl fragments Bug: 321808716 Change-Id: Iede3f50ec54bb55634f8e58bc2b87388f2692ad5 --- manifest_media.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/manifest_media.xml b/manifest_media.xml index 329dd2d4..52544290 100644 --- a/manifest_media.xml +++ b/manifest_media.xml @@ -1,22 +1,4 @@ - - android.hardware.media.c2 - hwbinder - 1.0 - - IComponentStore - default1 - - - - android.hardware.media.c2 - hwbinder - 1.2 - - IComponentStore - default - - android.hardware.media.c2 1 From 7c4a5e40193db19955a22c4e01c2bde5ea57970c Mon Sep 17 00:00:00 2001 From: jiangzining Date: Thu, 30 May 2024 15:23:10 +0800 Subject: [PATCH 45/52] [Scone] add BLUETOOTH_CONNECT to SCONE default permission MBA Approval: b/330640278 Bug: b/343608940 Test: Build and Flash Change-Id: Iab018eadac023f19297ee25e475374e4c7a691ae --- default-permissions.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index fb5ed945..03fdec2d 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -73,6 +73,8 @@ + + Date: Wed, 5 Jun 2024 12:59:23 +0000 Subject: [PATCH 46/52] 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: Ieab46eb2561f910be2bf016fe4c63062a4e31a66 --- usb/usb/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp index 5afdcc66..fa7a07f7 100644 --- a/usb/usb/Android.bp +++ b/usb/usb/Android.bp @@ -52,6 +52,7 @@ cc_binary { "libbinder_ndk", "libprotobuf-cpp-lite", "server_configurable_flags", + "libaconfig_storage_read_api_cc", ], static_libs: [ "libpixelusb", From cd0c17add9e97c542b0e4fcaa17aa157cb2c499e Mon Sep 17 00:00:00 2001 From: Utku Utkan Date: Wed, 5 Jun 2024 04:47:33 +0000 Subject: [PATCH 47/52] Remove ACCESS_FINE_LOCATION permission pregrant for PCS on G1 FLAG: EXEMPT Cleanup of obsolete permission pregrant Bug: 345021501 Test: m && flashall Change-Id: I8090d8a87605d2a60d57e14212e07625213a4088 --- default-permissions.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/default-permissions.xml b/default-permissions.xml index 03fdec2d..3ba60117 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -55,7 +55,6 @@ - From 4a42718d8a4f83b0a340f798a06a60dd85173255 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Thu, 23 May 2024 06:40:35 +0000 Subject: [PATCH 48/52] Update IDisplay to V12 Test: trigger test build Bug: 309897479 Change-Id: I338c9d05cd7b202e015288c4bd8e136d30304161 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 de5f3b4c..95c2113a 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -78,7 +78,7 @@ com.google.hardware.pixel.display - 11-12 + 12 IDisplay default From 6f6ad28270d93d31e6722324bcdfd920f1247a38 Mon Sep 17 00:00:00 2001 From: chenkris Date: Mon, 10 Jun 2024 17:24:28 +0000 Subject: [PATCH 49/52] gs101: build fingerprint dump Bug: 346450599 Test: adb bugreport Change-Id: I5a3d508592e9fed10e429d57c6c7068e0ce0d918 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 3df64ff1..8df5b3fe 100644 --- a/device.mk +++ b/device.mk @@ -40,6 +40,7 @@ include device/google/gs-common/betterbug/betterbug.mk ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif +include device/google/gs-common/fingerprint/fingerprint.mk TARGET_BOARD_PLATFORM := gs101 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) From 744c86c49a9ff9e29e2193cdc5079b27d5e06ec3 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Wed, 12 Jun 2024 17:14:02 +0800 Subject: [PATCH 50/52] usb: Add retry on role switch Bug: 341996696 Change-Id: I8caa65288af1588d24fea4aa6c5768d45d69bbd5 Signed-off-by: Kyle Tso (cherry picked from commit ef5856a4474002cc35a51377adffddd4cb239796) --- usb/usb/Usb.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index b8c5c8ea..39cbceb5 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -593,6 +593,10 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role fp = fopen(filename.c_str(), "w"); if (fp != NULL) { int ret = fputs(convertRoletoString(in_role).c_str(), fp); + if (ret == EAGAIN) { + std::this_thread::sleep_for(std::chrono::milliseconds(700)); + ret = fputs(convertRoletoString(in_role).c_str(), fp); + } fclose(fp); if ((ret != EOF) && ReadFileToString(filename, &written)) { written = Trim(written); From c5a560160fd82e94870a2252037d394e1e1f9780 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Thu, 13 Jun 2024 16:54:37 +0800 Subject: [PATCH 51/52] usb: Log for retry on role switch Add a log for the retry. Also define the sleep time in the header file. Bug: 341996696 Change-Id: Ib3cc0c6ad576e7cda26b7f50cdc61d52e6349c78 Signed-off-by: Kyle Tso (cherry picked from commit d17fdff5f81cff76adaa75d50f26318be8048123) --- usb/usb/Usb.cpp | 3 ++- usb/usb/Usb.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 39cbceb5..0736f4c4 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -594,7 +594,8 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role if (fp != NULL) { int ret = fputs(convertRoletoString(in_role).c_str(), fp); if (ret == EAGAIN) { - std::this_thread::sleep_for(std::chrono::milliseconds(700)); + ALOGI("role switch busy, retry in %d ms", ROLE_SWAP_RETRY_MS); + std::this_thread::sleep_for(std::chrono::milliseconds(ROLE_SWAP_RETRY_MS)); ret = fputs(convertRoletoString(in_role).c_str(), fp); } fclose(fp); diff --git a/usb/usb/Usb.h b/usb/usb/Usb.h index facc328e..15348af0 100644 --- a/usb/usb/Usb.h +++ b/usb/usb/Usb.h @@ -55,6 +55,8 @@ constexpr char kGadgetName[] = "11110000.dwc3"; #define VBUS_PATH NEW_UDC_PATH "dwc3_exynos_otg_b_sess" #define USB_DATA_PATH NEW_UDC_PATH "usb_data_enabled" +#define ROLE_SWAP_RETRY_MS 700 + struct Usb : public BnUsb { Usb(); From ebddc4ff3f9e2384f10ddadc1adbd0be9483c046 Mon Sep 17 00:00:00 2001 From: liangjlee Date: Thu, 27 Jun 2024 02:04:57 +0800 Subject: [PATCH 52/52] gs101: Include power/power.mk Bug: 331612600 Flag: EXEMPT (bug 337358613) Signed-off-by: liangjlee (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7b58898aee6694762f57077bac5626f7baa32a46) Merged-In: Ibf7dda6c4c13d6513e2f08239c95c6b2778a98ec Change-Id: Ibf7dda6c4c13d6513e2f08239c95c6b2778a98ec --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 8df5b3fe..20b0e3a8 100644 --- a/device.mk +++ b/device.mk @@ -25,6 +25,7 @@ include device/google/gs-common/thermal/dump/thermal.mk include device/google/gs-common/thermal/thermal_hal/device.mk include device/google/gs-common/pixel_metrics/pixel_metrics.mk include device/google/gs-common/performance/perf.mk +include device/google/gs-common/power/power.mk include device/google/gs-common/display/dump.mk include device/google/gs101/dumpstate/item.mk include device/google/gs-common/radio/dump.mk