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

am: 8f42d1a4ab

Change-Id: Ie44be5ec6a14bc137b08d6c233704af03f4a27ad
This commit is contained in:
edgar.huang
2017-09-06 00:30:44 +00:00
committed by android-build-merger

View File

@@ -561,7 +561,7 @@ public class FingerprintSettings extends SubSettings {
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;