From 957477e79fe283f6a53ad1c6d19747ebe63cfeb1 Mon Sep 17 00:00:00 2001
From: Mars Lin <marslin@google.com>
Date: Wed, 8 Jun 2022 22:08:50 +0800
Subject: [PATCH 1/3] gs101: Move tetheroffload HAL to raviole

Since T6 does not support tetheroffload,
move the tetheroffload HAL to raviole.

Bug: 232717674
Test: Check if the manifest file exist in vendor/etc/vintf/manifest/
Change-Id: Ibbd315eec97e4e035fef986e389ba1124223390d
---
 device.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/device.mk b/device.mk
index a2ac82f9..64f554c3 100644
--- a/device.mk
+++ b/device.mk
@@ -1123,10 +1123,6 @@ PRODUCT_PACKAGES += \
 	update_engine_sideload \
 	update_verifier
 
-# tetheroffload HAL
-PRODUCT_PACKAGES += \
-	vendor.samsung_slsi.hardware.tetheroffload@1.1-service
-
 # pKVM
 $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
 PRODUCT_BUILD_PVMFW_IMAGE := true

From b4854aa4bb31e1c21b5949e2697cea0b9161c009 Mon Sep 17 00:00:00 2001
From: Ken Huang <kenbshuang@google.com>
Date: Thu, 9 Jun 2022 02:50:38 +0000
Subject: [PATCH 2/3] Revert "dumpstate: add HWC logs"

This reverts commit b495f66b8559d36f0b500c755a952976413620d1.

Reason for revert: CTS failure

Bug: 233982921
Test: bugreport
Change-Id: Ic1bb3fe6b3ac2b8f56646e3c9cdbfda963a5462e
---
 dumpstate/DumpstateDevice.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 7da9b3fc..b75ba64f 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -961,10 +961,6 @@ void DumpstateDevice::dumpDisplaySection(int fd) {
                    CommandOptions::WithTimeout(2).Build());
     DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo");
     DumpFileToFd(fd, "secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo");
-    RunCommandToFd(fd, "HWC logs", {"/vendor/bin/sh", "-c",
-                   "for f in $(ls /data/vendor/log/hwc/*hwc_*); do "
-                   "echo $f ; cat $f ; done"},
-                   CommandOptions::WithTimeout(2).Build());
 }
 
 // Dump items related to AoC

From e973ddc48072ba68dc55d899cb1ec7e7e2c2f879 Mon Sep 17 00:00:00 2001
From: Zac Iqbal <zacharyi@google.com>
Date: Thu, 9 Jun 2022 18:55:40 +0000
Subject: [PATCH 3/3] Revert "DO NOT MERGE Remove unintended face config am:
 875235afbf"

Revert submission 18799414-am-e98f52416a40436ba0044e72d6feed21

Reason for revert: The merge path was only meant for tm-dev.
Reverted Changes:
I6ace51cab:DO NOT MERGE Remove faceauth from raven am: 783e56...
I049a9c205:DO NOT MERGE Remove unintended face config am: 875...
I50ae185c6:DO NOT MERGE Remove unintended faceauth configs am...

Change-Id: I0b0c885ecb47e94d3327c7436d61b07a58c999d5
---
 device_framework_matrix_product.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 5e4785ba..863fc2ab 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -56,6 +56,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+      <name>com.google.face.debug</name>
+        <interface>
+            <name>IDebugHost</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="aidl" optional="true">
       <name>com.google.edgetpu</name>
         <version>2</version>