Merge changes I869b27c7,I384ab5b6 into udc-d1-dev am: 4c63b6ff6d am: 524d93e7a2

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23405079

Change-Id: I78867e41e96b071e985b2664331c614399a37786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mark Chang 2023-05-26 09:02:12 +00:00 committed by Automerger Merge Worker
commit 6923e38cbf
2 changed files with 4 additions and 0 deletions

View file

@ -142,6 +142,7 @@
</hal> </hal>
<hal format="aidl" optional="true"> <hal format="aidl" optional="true">
<name>com.google.input.algos.spd</name> <name>com.google.input.algos.spd</name>
<version>2</version>
<interface> <interface>
<name>IScreenProtectorDetectorService</name> <name>IScreenProtectorDetectorService</name>
<instance>default</instance> <instance>default</instance>
@ -157,6 +158,7 @@
</hal> </hal>
<hal format="aidl" optional="true"> <hal format="aidl" optional="true">
<name>com.google.input.algos.gril</name> <name>com.google.input.algos.gril</name>
<version>2</version>
<interface> <interface>
<name>IGrilAntennaTuningService</name> <name>IGrilAntennaTuningService</name>
<instance>default</instance> <instance>default</instance>

View file

@ -25,6 +25,7 @@
</hal> </hal>
<hal format="aidl"> <hal format="aidl">
<name>com.google.input.algos.spd</name> <name>com.google.input.algos.spd</name>
<version>2</version>
<interface> <interface>
<name>IScreenProtectorDetectorService</name> <name>IScreenProtectorDetectorService</name>
<instance>default</instance> <instance>default</instance>
@ -40,6 +41,7 @@
</hal> </hal>
<hal format="aidl"> <hal format="aidl">
<name>com.google.input.algos.gril</name> <name>com.google.input.algos.gril</name>
<version>2</version>
<interface> <interface>
<name>IGrilAntennaTuningService</name> <name>IGrilAntennaTuningService</name>
<instance>default</instance> <instance>default</instance>