PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a NPE when highlighting fingerprint row."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-24 21:44:50 +00:00
committed by Android (Google) Code Review
parent 429c787168 13c7e68646
commit 8653748a18
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -605,6 +605,10 @@ public class FingerprintSettings extends SubSettings {
final Drawable highlight = getHighlightDrawable(); final Drawable highlight = getHighlightDrawable();
if (highlight != null && fpref != null) { if (highlight != null && fpref != null) {
final View view = fpref.getView(); final View view = fpref.getView();
if (view == null) {
// FingerprintPreference is not bound to UI yet, so view is null.
return;
}
final int centerX = view.getWidth() / 2; final int centerX = view.getWidth() / 2;
final int centerY = view.getHeight() / 2; final int centerY = view.getHeight() / 2;
highlight.setHotspot(centerX, centerY); highlight.setHotspot(centerX, centerY);