commit 8f42d1a4ab59da4542f8656c66f211cc503e6e2c
author edgar.huang <edgar.huang@spreadtrum.com> Wed Sep 06 00:21:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 06 00:21:17 2017 +0000
tree d6a9b0845fae85da8f18e8319a4a8e593f4c1ae1
parent a1bcb02184391b3e57bfe117c3e1f3549f077c96
parent 2584202cb70481d5d9cc8746945aebb9fcec1d31

Merge "Settings is crashed high probability when doing follow steps"
am: 2584202cb7

Change-Id: I6292acd5c7766c1cf13d2de4757fe4499a076f46

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 f41463b..5bde6de 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -561,7 +561,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;