From c6173cf7f26dbaf13e891fb7cf43bf8dbefe2af0 Mon Sep 17 00:00:00 2001 From: Austin Delgado Date: Mon, 8 May 2023 12:45:08 -0700 Subject: [PATCH] Fix 180 rotations during enrollment Change-Id: I627304a0d26264bc162083cd230a8c5741e0ea95 Test: atest SystemUITests:com.android.systemui.biometrics Bug: 279546250 --- .../biometrics/BiometricDisplayListener.kt | 13 ++-- .../BiometricDisplayListenerTest.java | 73 ------------------- 2 files changed, 6 insertions(+), 80 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDisplayListener.kt b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDisplayListener.kt index 38a7c5d7a8af1..e9b637230ede5 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDisplayListener.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDisplayListener.kt @@ -20,7 +20,7 @@ import android.content.Context import android.hardware.display.DisplayManager import android.hardware.fingerprint.FingerprintSensorPropertiesInternal import android.os.Handler -import android.view.Surface +import android.view.DisplayInfo import com.android.systemui.biometrics.BiometricDisplayListener.SensorType.Generic /** @@ -37,7 +37,7 @@ class BiometricDisplayListener( private val onChanged: () -> Unit ) : DisplayManager.DisplayListener { - private var lastRotation = Surface.ROTATION_0 + private var cachedDisplayInfo = DisplayInfo() override fun onDisplayAdded(displayId: Int) {} override fun onDisplayRemoved(displayId: Int) {} @@ -55,15 +55,14 @@ class BiometricDisplayListener( } private fun didRotationChange(): Boolean { - val rotation = context.display?.rotation ?: return false - val last = lastRotation - lastRotation = rotation - return last != rotation + val last = cachedDisplayInfo.rotation + context.display?.getDisplayInfo(cachedDisplayInfo) + return last != cachedDisplayInfo.rotation } /** Listen for changes. */ fun enable() { - lastRotation = context.display?.rotation ?: Surface.ROTATION_0 + context.display?.getDisplayInfo(cachedDisplayInfo) displayManager.registerDisplayListener( this, handler, diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/BiometricDisplayListenerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/BiometricDisplayListenerTest.java index c6315cf94251c..8547fa33c9de4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/BiometricDisplayListenerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/BiometricDisplayListenerTest.java @@ -22,8 +22,6 @@ import static com.android.systemui.biometrics.BiometricDisplayListener.SensorTyp import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.same; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -36,7 +34,6 @@ import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; import android.view.Display; import android.view.Surface; -import android.view.Surface.Rotation; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; @@ -106,76 +103,6 @@ public class BiometricDisplayListenerTest extends SysuiTestCase { verify(mDisplayManager).unregisterDisplayListener(any()); } - @Test - public void detectsRotationChanges_forUdfps_relativeToRotationWhenEnabled() { - // Create a listener when the rotation is portrait. - when(mDisplay.getRotation()).thenReturn(Surface.ROTATION_0); - BiometricDisplayListener listener = new BiometricDisplayListener( - mContextSpy, mDisplayManager, mHandler, mUdfpsType, mOnChangedCallback); - - // Rotate the device to landscape and then enable the listener. - when(mDisplay.getRotation()).thenReturn(Surface.ROTATION_90); - listener.enable(); - verify(mDisplayManager).registerDisplayListener(mDisplayListenerCaptor.capture(), - same(mHandler), eq(DisplayManager.EVENT_FLAG_DISPLAY_CHANGED)); - - // Rotate the device back to portrait and ensure the rotation is detected. - when(mDisplay.getRotation()).thenReturn(Surface.ROTATION_0); - mDisplayListenerCaptor.getValue().onDisplayChanged(999); - verify(mOnChangedCallback).invoke(); - } - - @Test - public void callsOnChanged_forUdfps_onlyWhenRotationChanges() { - final @Rotation int[] rotations = - new int[]{ - Surface.ROTATION_0, - Surface.ROTATION_90, - Surface.ROTATION_180, - Surface.ROTATION_270 - }; - - for (@Rotation int rot1 : rotations) { - for (@Rotation int rot2 : rotations) { - // Make the third rotation the same as the first one to simplify this test. - @Rotation int rot3 = rot1; - - // Clean up prior interactions. - reset(mDisplayManager); - reset(mDisplay); - reset(mOnChangedCallback); - - // Set up the mock for 3 invocations. - when(mDisplay.getRotation()).thenReturn(rot1, rot2, rot3); - - BiometricDisplayListener listener = new BiometricDisplayListener( - mContextSpy, mDisplayManager, mHandler, mUdfpsType, mOnChangedCallback); - listener.enable(); - - // The listener should record the current rotation and register a display listener. - verify(mDisplay).getRotation(); - verify(mDisplayManager).registerDisplayListener(mDisplayListenerCaptor.capture(), - same(mHandler), eq(DisplayManager.EVENT_FLAG_DISPLAY_CHANGED)); - - // Test the first rotation since the listener was enabled. - mDisplayListenerCaptor.getValue().onDisplayChanged(123); - if (rot2 != rot1) { - verify(mOnChangedCallback).invoke(); - } else { - verify(mOnChangedCallback, never()).invoke(); - } - - // Test continued rotations. - mDisplayListenerCaptor.getValue().onDisplayChanged(123); - if (rot3 != rot2) { - verify(mOnChangedCallback, times(2)).invoke(); - } else { - verify(mOnChangedCallback, never()).invoke(); - } - } - } - } - @Test public void callsOnChanged_forSideFingerprint_whenAnythingDisplayChanges() { // Any rotation will do for this test, we just need to return something.