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

am: e096a55f03

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

View File

@@ -597,7 +597,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;