From e0fbd0d76411edc432f4fcbc7d652507f6263561 Mon Sep 17 00:00:00 2001 From: Devika Krishnadas Date: Mon, 26 Feb 2024 17:58:11 +0000 Subject: [PATCH 1/5] 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 04585d5b..975f28ed 100644 --- a/device.mk +++ b/device.mk @@ -514,10 +514,6 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000 PRODUCT_PACKAGES += \ com.android.future.usb.accessory -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 739450ad3ab525ab3f991836e6d3c8a0558e622c Mon Sep 17 00:00:00 2001 From: Mark Chang Date: Fri, 1 Mar 2024 12:01:22 +0000 Subject: [PATCH 2/5] Add sepolicy include to gs201. Bug: 325422902 Test: Manual, system booted without sepolicy denied error. Change-Id: Id0cd182117340159aed00ad55988323bd45ba840 Signed-off-by: Mark Chang --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 975f28ed..82ab7693 100644 --- a/device.mk +++ b/device.mk @@ -1155,3 +1155,4 @@ 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 From 16d25d07b259a336f3dac58a043444108cd0fe8b Mon Sep 17 00:00:00 2001 From: Sungtak Lee Date: Mon, 29 Jan 2024 08:17:57 +0000 Subject: [PATCH 3/5] Add media.c2 aidl fragments on gs201 based devices Bug: 321808716 Change-Id: If0f73c6151127ac5cc786a5580446313f9640025 --- manifest_media.xml | 12 ++++++++++++ manifest_media_aosp.xml | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/manifest_media.xml b/manifest_media.xml index 38e56ba2..b29c7f2f 100644 --- a/manifest_media.xml +++ b/manifest_media.xml @@ -1,4 +1,5 @@ + android.hardware.media.c2 hwbinder @@ -17,4 +18,15 @@ 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..2d1888be 100644 --- a/manifest_media_aosp.xml +++ b/manifest_media_aosp.xml @@ -1,4 +1,5 @@ + android.hardware.media.c2 hwbinder @@ -8,4 +9,10 @@ default + + + android.hardware.media.c2 + 1 + IComponentStore/default + From 43d42739b57713f7e41df147e6372d1ccce6243f Mon Sep 17 00:00:00 2001 From: George Lee Date: Tue, 5 Mar 2024 00:36:35 +0000 Subject: [PATCH 4/5] bcl: Adjust GPU LIGHT clk divider ratio Set GPU LIGHT clk divider ratios to /2. Bug: 327700285 Test: Confirm no prints like: "28000000.mali: Ctx 8349_23 Group 0 CSG 3 CSI: 3" while running GFXBench under LIGHT MITIGATION Change-Id: I4b62b33c0b72e5a053f477943379727d58f7298e Signed-off-by: George Lee --- conf/init.gs201.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index abc18c58..09898cbd 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -897,7 +897,7 @@ on property:vendor.brownout.mitigation.ready=1 write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0x80041c3 #DFS write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu1_heavy_clk_ratio 0xfff041c0 #DFS write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio 0xfff041c0 #DFS - write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio 0xfff041c1 #DFS + write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio 0xfff041c3 #DFS write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_light_clk_ratio 0xfff041c3 #OCP write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio 0xfff04385 #OCP write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio 0xfff041c1 #OCP From 3f5c12abada31befa0d9f869bf6628d06ee05aa4 Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Tue, 5 Mar 2024 00:55:40 +0000 Subject: [PATCH 5/5] Revert "Add betterbug mk to gs201" 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: Id77188dd9f6f5acaed1506a9489f5d6f9874dde9 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 82ab7693..8febfa10 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