commit f504e514c45c547dcb48dcec6eb915abd1cd786e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 08 23:03:01 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 08 23:03:01 2021 +0000
tree c6153b62dac1058843c74a4436cc9059ef134c1f
parent 88c14d2b1463414605b052f712fd3799017573a1
parent 6135189a2925bf5e5d7222a410777672edb14432

Merge changes from topic "revert-1540633-DNRXHDZSUB"

* changes:
  Revert "matrix: IVibrator AIDL has version 2."
  Revert "Update AIDL IVibrator manifest version to 2."

compatibility_matrices/compatibility_matrix.current.xml

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index 6de12f4..fef5d67 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>

vibrator/aidl/default/vibrator-default.xml

diff --git a/vibrator/aidl/default/vibrator-default.xml b/vibrator/aidl/default/vibrator-default.xml
index 4db8f8c..49b11ec 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>