From 1fef1eca2d08e9554c8e458a3b22ef38e637f171 Mon Sep 17 00:00:00 2001
From: Rick Chen <rickctchen@google.com>
Date: Fri, 18 Feb 2022 15:20:09 +0800
Subject: [PATCH 1/3] Remove sensor HAL 1.0 config

Bug: 202249887
Test: Verify basic sampling functions on C10.
      Run VtsHalSensorsV1_0TargetTest and see no test items.
Signed-off-by: Rick Chen <rickctchen@google.com>
Change-Id: I7ce97e417ce5e8c4589845a5138010aa9288ccb3
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index eab7a444..b80598c0 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -129,14 +129,5 @@
            <instance>default</instance>
        </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <kernel target-level="6"/>
 </manifest>

From 0b02e303b148d2e782e50613c7f57052cd0e222f Mon Sep 17 00:00:00 2001
From: Lais Andrade <lsandrade@google.com>
Date: Thu, 17 Feb 2022 21:36:22 +0000
Subject: [PATCH 2/3] Add default alarm and media vibration intensity settings

Change-Id: Ib5cbda371672dde8cbcd17692ecf777a3c3c95e1
Fix: 219692498
Test: manual
---
 overlay/frameworks/base/core/res/res/values/config.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 7ab9468a..65fdf501 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -260,10 +260,19 @@
         <item>jp.konami.epjCastlevania2</item>
     </string-array>
 
+
+    <!-- The default intensity level for alarm vibrations. See
+         Settings.System.ALARM_VIBRATION_INTENSITY more details on the constant values and
+         meanings. -->
+    <integer name="config_defaultAlarmVibrationIntensity">3</integer>
     <!-- The default intensity level for haptic feedback. See
          Settings.System.HAPTIC_FEEDBACK_INTENSITY more details on the constant values and
          meanings. -->
     <integer name="config_defaultHapticFeedbackIntensity">3</integer>
+    <!-- The default intensity level for media vibrations. See
+         Settings.System.MEDIA_VIBRATION_INTENSITY more details on the constant values and
+         meanings. -->
+    <integer name="config_defaultMediaVibrationIntensity">3</integer>
     <!-- The default intensity level for notification vibrations. See
          Settings.System.NOTIFICATION_VIBRATION_INTENSITY more details on the constant values and
          meanings. -->

From 4f30e468e4fe61d66b795c424db32d30be6fd098 Mon Sep 17 00:00:00 2001
From: Ray Chi <raychi@google.com>
Date: Thu, 17 Feb 2022 14:17:46 +0800
Subject: [PATCH 3/3] modify the path of shell binary

Currently, we should use the vendor shell to run irq script.
This patch will modify the shell path.

Bug: 202103325
Test: switch functions and check the value of smp_affinity_list
Change-Id: Iae572bb1ee218eb205c5e65d20ba6dfa583b9ad6
Merged-In: Iae572bb1ee218eb205c5e65d20ba6dfa583b9ad6
(cherry picked from commit e4796c373ce50baf226b1c34998e2d46531d7a5f)
---
 set_usb_irq.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/set_usb_irq.sh b/set_usb_irq.sh
index c131713e..29d37812 100644
--- a/set_usb_irq.sh
+++ b/set_usb_irq.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/vendor/bin/sh
 
 # Switch into /proc/irq/$IRQ for the dwc3 usb controller
 cd /proc/irq/*/dwc3/.. || exit 7