From 9e8fe956f65cc8824d22e415246ca22c768c0c31 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 8 Jan 2021 21:09:18 +0000
Subject: [PATCH 1/2] Revert "Update AIDL IVibrator manifest version to 2."

Revert submission 1540633

Reason for revert: AOSP not updated yet
Reverted Changes:
I418cd4fc5:Update AIDL IVibrator manifest version to 2.
I08b4b189d:matrix: IVibrator AIDL has version 2.

Change-Id: I1cc5ab201e079a09c4db2667207c856ff56b0988
---
 vibrator/aidl/default/vibrator-default.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vibrator/aidl/default/vibrator-default.xml b/vibrator/aidl/default/vibrator-default.xml
index 4db8f8c511..49b11ec8da 100644
--- a/vibrator/aidl/default/vibrator-default.xml
+++ b/vibrator/aidl/default/vibrator-default.xml
@@ -1,7 +1,6 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.vibrator</name>
-        <version>2</version>
         <fqname>IVibrator/default</fqname>
     </hal>
 </manifest>

From 6135189a2925bf5e5d7222a410777672edb14432 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 8 Jan 2021 21:09:18 +0000
Subject: [PATCH 2/2] Revert "matrix: IVibrator AIDL has version 2."

Revert submission 1540633

Reason for revert: AOSP not updated yet
Reverted Changes:
I418cd4fc5:Update AIDL IVibrator manifest version to 2.
I08b4b189d:matrix: IVibrator AIDL has version 2.

Change-Id: I429faacf309aa61aa044d72b873e23ba25ed5bca
---
 compatibility_matrices/compatibility_matrix.current.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index 6de12f4c49..fef5d67320 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -526,7 +526,6 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.vibrator</name>
-        <version>1-2</version>
         <interface>
             <name>IVibrator</name>
             <instance>default</instance>