diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index 96834e4f1a8c1..5610377367c4c 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -57,6 +57,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; import android.os.UserManager; +import android.util.DisplayUtils; import android.util.Log; import android.util.RotationUtils; import android.util.SparseBooleanArray; @@ -120,8 +121,6 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba private final Provider mUdfpsControllerFactory; private final Provider mSidefpsControllerFactory; - @NonNull private Point mStableDisplaySize = new Point(); - private final Display mDisplay; private float mScaleFactor = 1f; // sensor locations without any resolution scaling nor rotation adjustments: @@ -531,10 +530,11 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba */ private void updateSensorLocations() { mDisplay.getDisplayInfo(mCachedDisplayInfo); - + final Display.Mode maxDisplayMode = + DisplayUtils.getMaximumResolutionDisplayMode(mCachedDisplayInfo.supportedModes); final float scaleFactor = android.util.DisplayUtils.getPhysicalPixelDisplaySizeRatio( - mStableDisplaySize.x, mStableDisplaySize.y, mCachedDisplayInfo.getNaturalWidth(), - mCachedDisplayInfo.getNaturalHeight()); + maxDisplayMode.getPhysicalWidth(), maxDisplayMode.getPhysicalHeight(), + mCachedDisplayInfo.getNaturalWidth(), mCachedDisplayInfo.getNaturalHeight()); if (scaleFactor == Float.POSITIVE_INFINITY) { mScaleFactor = 1f; } else { @@ -812,7 +812,6 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba ); } - mStableDisplaySize = mDisplayManager.getStableDisplaySize(); mActivityTaskManager.registerTaskStackListener(mTaskStackListener); mOrientationListener.enable(); updateSensorLocations(); @@ -1196,7 +1195,6 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba @Override public void dump(@NonNull PrintWriter pw, @NonNull String[] args) { final AuthDialog dialog = mCurrentDialog; - pw.println(" stableDisplaySize=" + mStableDisplaySize); pw.println(" mCachedDisplayInfo=" + mCachedDisplayInfo); pw.println(" mScaleFactor=" + mScaleFactor); pw.println(" faceAuthSensorLocationDefault=" + mFaceSensorLocationDefault);