Merge "Fix UDFPS enrolling crash" into udc-dev

2023-03-01 09:12:38 +00:00
parent c5054d5907 f2db627a7c
commit 8e3c46b1c9
1 changed files with 4 additions and 0 deletions
--- a/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java
+++ b/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java
@@ -226,6 +226,10 @@ public class UdfpsEnrollView extends FrameLayout {
        }

        DisplayInfo displayInfo = new DisplayInfo();
+        if (getDisplay() == null) {
+            android.util.Log.e(TAG, "Can not get display");
+            return;
+        }
        getDisplay().getDisplayInfo(displayInfo);
        Rect udfpsBounds = mSensorProperties.getLocation().getRect();
        float scaleFactor = mUdfpsUtils.getScaleFactor(displayInfo);