From 8eab4f33901d036feaef772eb750b525016637d3 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 8 Jan 2021 17:03:35 -0800
Subject: [PATCH 1/2] Reland "matrix: IVibrator AIDL has version 2."

This is reverted in AOSP because vibrator 2 has not been published
in AOSP, but relanded in internal because vibrator 2 is in internal.

This reverts commit 6135189a2925bf5e5d7222a410777672edb14432.

Test: TH
Bug: 150034914

Change-Id: I94a663be8a07a24587127d3ca489647a16c0be7a
---
 compatibility_matrices/compatibility_matrix.current.xml | 1 +
 1 file changed, 1 insertion(+)

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

From 31a72d0328f7b654d4b533cbde84ef0c79843258 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 8 Jan 2021 17:04:32 -0800
Subject: [PATCH 2/2] Reland "Update AIDL IVibrator manifest version to 2."

This is reverted in AOSP because vibrator 2 has not been published
in AOSP, but relanded in internal because vibrator 2 is in internal.

This reverts commit 9e8fe956f65cc8824d22e415246ca22c768c0c31.

Test: TH
Bug: 150034914

Change-Id: I3c40be3f9ba7806455bf5b7e8142e11c581ddb73
---
 vibrator/aidl/default/vibrator-default.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vibrator/aidl/default/vibrator-default.xml b/vibrator/aidl/default/vibrator-default.xml
index 137a811bf9..b5bd3ddd1e 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">