commit e096a55f03e727cf8fc3f1ff093a423b06407802
author edgar.huang <edgar.huang@spreadtrum.com> Wed Sep 06 00:30:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 06 00:30:44 2017 +0000
tree f6d3d67c7dcf11e87d62ce132f49a11133729146
parent 450f423a21893444937c55833d627a31d6ede003
parent 8f42d1a4ab59da4542f8656c66f211cc503e6e2c

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

Change-Id: Ie44be5ec6a14bc137b08d6c233704af03f4a27ad

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;