From fa893aaabcf0907254ece0ab7b1c00c8a3fd857e Mon Sep 17 00:00:00 2001
From: Ilya Matyukhin <ilyamaty@google.com>
Date: Mon, 13 Apr 2020 14:44:18 -0700
Subject: [PATCH 1/3] Use biometrics.fingerprint@2.2 for wahoo

Bug: 153909042
Bug: 153012763
Bug: 153830435
Test: built taimen-userdebug with a @2.2 HAL
Test: "adb shell lshal | grep fingerprint@" shows the @2.2 HAL
Change-Id: Ied411a65f482ea79d9000e2f4191dba5f8927606
(cherry picked from commit a9427075f02ff5a4edd9ead98beb814094a528b0)
---
 manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.xml b/manifest.xml
index 27526081..8f3dead2 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -20,7 +20,7 @@
     <hal format="hidl">
         <name>android.hardware.biometrics.fingerprint</name>
         <transport>hwbinder</transport>
-        <version>2.1</version>
+        <version>2.2</version>
         <interface>
             <name>IBiometricsFingerprint</name>
             <instance>default</instance>

From 50553304b5702936d9c2083452d358e7f3cc9a48 Mon Sep 17 00:00:00 2001
From: Paul Scovanner <pscovanner@google.com>
Date: Mon, 29 Jun 2020 19:12:04 +0000
Subject: [PATCH 2/3] Update Wahoo SVN to 50 for R

Bug: 160158282
Change-Id: I4abfb03b04e21b51f76b892834446208d119b99d
(cherry picked from commit f93eec452ce8ab787319592d1a3f4ed4d4746b2a)
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index beff8205..80e08ae2 100755
--- a/device.mk
+++ b/device.mk
@@ -47,7 +47,7 @@ PRODUCT_COPY_FILES += \
 
 # Set the SVN for the targeted MR release
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=47
+    ro.vendor.build.svn=50
 
 # Enforce privapp-permissions whitelist
 PRODUCT_PROPERTY_OVERRIDES += \

From a2febf5fa6829427f07d12ba1ef0be741354848f Mon Sep 17 00:00:00 2001
From: Paul Scovanner <pscovanner@google.com>
Date: Tue, 11 Aug 2020 19:27:41 +0000
Subject: [PATCH 3/3] Update Wahoo SVN to 51

Bug: 163542576
Change-Id: I4c98b705f91eb47469d02f5c1a5fa1ad57581865
(cherry picked from commit 508ceb4430c59d30facfa63ddef72f8d17475db8)
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 80e08ae2..b5dff485 100755
--- a/device.mk
+++ b/device.mk
@@ -47,7 +47,7 @@ PRODUCT_COPY_FILES += \
 
 # Set the SVN for the targeted MR release
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=50
+    ro.vendor.build.svn=51
 
 # Enforce privapp-permissions whitelist
 PRODUCT_PROPERTY_OVERRIDES += \