commit 70d23e1bc9a4a40dcc7fc8b141ea3b4cb9bdd176
author Yifan Hong <elsk@google.com> Mon Jan 11 17:12:05 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 11 17:12:05 2021 +0000
tree 721c1a4391961c1641ab4ffa6949d4812b69c070
parent 9e76e5cdb2ae0fe7db123b290b822f36bcf32f7b
parent 31a72d0328f7b654d4b533cbde84ef0c79843258

Merge changes from topic "vibrator2-vintf"

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

compatibility_matrices/compatibility_matrix.current.xml

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index f40f180..6938030 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -561,6 +561,7 @@
     </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 137a811..b5bd3dd 100644
--- a/vibrator/aidl/default/vibrator-default.xml
+++ b/vibrator/aidl/default/vibrator-default.xml
@@ -1,6 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.vibrator</name>
+        <version>2</version>
         <fqname>IVibrator/default</fqname>
     </hal>
     <hal format="aidl">