commit c9e532f508c1faa25a59e0ea1fe129e920cea6a4
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 08 09:56:31 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 08 09:56:31 2017 +0000
tree a6f40c2f4e37cc8d0154832e96c507fecbcf4a64
parent 2584202cb70481d5d9cc8746945aebb9fcec1d31
parent be47df7395d1ccf1b35f33f963ca0c69a1036de0

Merge "Fix TrustedCredentialsSettings NPE"

src/com/android/settings/fingerprint/FingerprintSettings.java

diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index 64ce901..607d28c 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -558,7 +558,7 @@
             String prefName = genKey(fpId);
             FingerprintPreference fpref = (FingerprintPreference) findPreference(prefName);
             final Drawable highlight = getHighlightDrawable();
-            if (highlight != null) {
+            if (highlight != null && fpref != null) {
                 final View view = fpref.getView();
                 final int centerX = view.getWidth() / 2;
                 final int centerY = view.getHeight() / 2;