From b87b77a43af98646c08d1c3a678e46696da21ced Mon Sep 17 00:00:00 2001
From: Lei Ju <leiju@google.com>
Date: Sat, 17 Feb 2024 10:37:44 -0800
Subject: [PATCH 1/2] [gs101] Enable Multiclient HAL

Test: 1) complile and flash a gs101 device, passed PTS and CHQTS;
      2) checked logs to make sure no sepolicy violations

Bug: 247124878
Change-Id: I77925374dee75076de1820227cc8879a053af09b
---
 device.mk | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/device.mk b/device.mk
index ea89db65..baa919f1 100644
--- a/device.mk
+++ b/device.mk
@@ -69,7 +69,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	hardware/google/pixel \
 	device/google/gs101 \
 	device/google/gs101/powerstats \
-	system/chre/host/hal_generic \
+	vendor/google_devices/common/chre/host/hal \
 	vendor/google/whitechapel/tools \
 	vendor/google/camera \
 	vendor/google/interfaces \
@@ -339,24 +339,20 @@ PRODUCT_HOST_PACKAGES += \
 PRODUCT_PACKAGES += \
 	messaging
 
-# Contexthub HAL
-PRODUCT_PACKAGES += \
-    android.hardware.contexthub-service.generic
-
-# CHRE tools
+# CHRE
+## tools
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += \
 	chre_power_test_client \
-	chre_test_client
+	chre_test_client \
+	chre_aidl_hal_client
 endif
 
+## HAL
+include device/google/gs-common/chre/hal.mk
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.context_hub.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.context_hub.xml
-
-# Enable the CHRE Daemon
-CHRE_USF_DAEMON_ENABLED := true
 PRODUCT_PACKAGES += \
-	chre \
 	preloaded_nanoapps.json
 
 # Filesystem management tools

From 536524e4cd306d763fda5b0d10d5f0a0a716bc87 Mon Sep 17 00:00:00 2001
From: Daniel Okazaki <dtokazaki@google.com>
Date: Thu, 15 Feb 2024 23:01:36 +0000
Subject: [PATCH 2/2] dumpstate: moving charger nodes to user build

Bug: 323415060
Test: adb bugreport
Change-Id: I757d17f45f0cb302ec186ec5c1467e158c04a81a
Signed-off-by: Daniel Okazaki <dtokazaki@google.com>
---
 dumpstate/dump_gs101.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dumpstate/dump_gs101.sh b/dumpstate/dump_gs101.sh
index 7bd10d51..92f9ed34 100644
--- a/dumpstate/dump_gs101.sh
+++ b/dumpstate/dump_gs101.sh
@@ -154,14 +154,15 @@ do
   echo "$f: `cat $f`"
 done
 
+echo "\n------ DC_registers dump ------"
+cat "/sys/class/power_supply/pca9468-mains/device/registers_dump"
+echo "\n------ max77759_chg registers dump ------"
+cat "/sys/class/power_supply/main-charger/device/registers_dump"
+echo "\n------ max77729_pmic registers dump ------"
+cat /sys/devices/platform/10d50000.hsi2c/i2c-*/*-0066/registers_dump
+
 if [ $build_type = "userdebug" ]
 then
-  echo "\n------ DC_registers dump ------"
-  cat "/sys/class/power_supply/pca9468-mains/device/registers_dump"
-  echo "\n------ max77759_chg registers dump ------"
-  cat "/d/max77759_chg/registers"
-  echo "\n------ max77729_pmic registers dump ------"
-  cat "/d/max77729_pmic/registers"
   echo "\n------ Charging table dump ------"
   cat "/d/google_battery/chg_raw_profile"