Merge in upstream changes
From :https://github.com/phhusson/treble_patches
Change-Id: I785ed4d854f28f661b1b48530dc10a5adf076e74
diff --git a/patches/platform_frameworks_base/0005-Fix-62.patch b/patches/platform_frameworks_base/0005-Fix-62.patch
new file mode 100644
index 0000000..caf028d
--- /dev/null
+++ b/patches/platform_frameworks_base/0005-Fix-62.patch
@@ -0,0 +1,28 @@
+From ca27968613cbe47b158a690f82347586264bbe54 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Wed, 30 May 2018 14:05:30 +0200
+Subject: [PATCH 05/19] Fix(?) #62
+
+---
+ .../SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+index 62cd13b..7efbdb8 100644
+--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
++++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+@@ -891,7 +891,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
+
+ @Override
+ public void onAuthenticationError(int errMsgId, CharSequence errString) {
+- handleFingerprintError(errMsgId, errString.toString());
++ if(errString != null)
++ handleFingerprintError(errMsgId, errString.toString());
++ else
++ handleFingerprintError(errMsgId, "unknown error");
+ }
+
+ @Override
+--
+2.7.4
+