Merge "Fix UDFPS enrolling crash" into udc-dev am: 8e3c46b1c9 am: 0e5068fb58

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617267

Change-Id: I80b4128890f755c4112372e953d1d3f9fd3488b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vincent Wang
2023-03-01 10:52:46 +00:00
committed by Automerger Merge Worker

View File

@@ -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);