Biometrics: Pass halHandlesDisplayTouches to FingerprintSensorPropertiesInternal

Depends-on: I56166950c6ef7cbb0c4ac2c0b7998e4a909d4af9 Change-Id: I1b7eef5449f813deee23ebe9ff07d4d3b73ccf4b
2025-02-19 22:03:33 +00:00
parent 4d7aa10c21
commit 64de97c728
8 changed files with 13 additions and 0 deletions
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint2/fragment/FingerprintEnrollIntroFragmentTest.kt
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint2/fragment/FingerprintEnrollIntroFragmentTest.kt
@@ -79,6 +79,7 @@ class FingerprintEnrollIntroFragmentTest {
      listOf<ComponentInfoInternal>(),
      FingerprintSensorProperties.TYPE_POWER_BUTTON,
      false /* halControlsIllumination */,
+      false /* halHandlesDisplayTouches */,
      true /* resetLockoutRequiresHardwareAuthToken */,
      listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
    )
--- a/tests/screenshot/src/com/android/settings/tests/screenshot/biometrics/fingerprint/Injector.kt
+++ b/tests/screenshot/src/com/android/settings/tests/screenshot/biometrics/fingerprint/Injector.kt
@@ -68,6 +68,7 @@ class Injector(step: FingerprintNavigationStep.UiStep) {
        listOf<ComponentInfoInternal>(),
        FingerprintSensorProperties.TYPE_REAR,
        false /* halControlsIllumination */,
+        false /* halHandlesDisplayTouches */,
        true /* resetLockoutRequiresHardwareAuthToken */,
        listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
      )
--- a/tests/shared/src/com/android/settings/testutils2/FakeFingerprintManagerInteractor.kt
+++ b/tests/shared/src/com/android/settings/testutils2/FakeFingerprintManagerInteractor.kt
@@ -70,6 +70,7 @@ class FakeFingerprintManagerInteractor :
        listOf<ComponentInfoInternal>(),
        FingerprintSensorProperties.TYPE_POWER_BUTTON,
        false /* halControlsIllumination */,
+        false /* halHandlesDisplayTouches */,
        true /* resetLockoutRequiresHardwareAuthToken */,
        listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
      )
--- a/tests/unit/src/com/android/settings/fingerprint2/domain/interactor/FingerprintManagerInteractorTest.kt
+++ b/tests/unit/src/com/android/settings/fingerprint2/domain/interactor/FingerprintManagerInteractorTest.kt
@@ -127,6 +127,7 @@ class FingerprintManagerInteractorTest {
          listOf<ComponentInfoInternal>(),
          FingerprintSensorProperties.TYPE_POWER_BUTTON,
          false /* halControlsIllumination */,
+          false /* halHandlesDisplayTouches */,
          true /* resetLockoutRequiresHardwareAuthToken */,
          listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
        )
--- a/tests/unit/src/com/android/settings/fingerprint2/enrollment/viewmodel/FingerprintEnrollFindSensorViewModelV2Test.kt
+++ b/tests/unit/src/com/android/settings/fingerprint2/enrollment/viewmodel/FingerprintEnrollFindSensorViewModelV2Test.kt
@@ -165,6 +165,7 @@ class FingerprintEnrollFindSensorViewModelV2Test {
            listOf<ComponentInfoInternal>(),
            FingerprintSensorProperties.TYPE_UDFPS_OPTICAL,
            false /* halControlsIllumination */,
+            false /* halHandlesDisplayTouches */,
            true /* resetLockoutRequiresHardwareAuthToken */,
            listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
          )
@@ -229,6 +230,7 @@ class FingerprintEnrollFindSensorViewModelV2Test {
            listOf<ComponentInfoInternal>(),
            FingerprintSensorProperties.TYPE_REAR,
            false /* halControlsIllumination */,
+            false /* halHandlesDisplayTouches */,
            true /* resetLockoutRequiresHardwareAuthToken */,
            listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
          )
@@ -253,6 +255,7 @@ class FingerprintEnrollFindSensorViewModelV2Test {
            listOf<ComponentInfoInternal>(),
            FingerprintSensorProperties.TYPE_UDFPS_OPTICAL,
            false /* halControlsIllumination */,
+            false /* halHandlesDisplayTouches */,
            true /* resetLockoutRequiresHardwareAuthToken */,
            listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
          )
--- a/tests/unit/src/com/android/settings/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollConfirmationViewModelTest.kt
+++ b/tests/unit/src/com/android/settings/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollConfirmationViewModelTest.kt
@@ -106,6 +106,7 @@ class FingerprintEnrollConfirmationViewModelTest {
            listOf<ComponentInfoInternal>(),
            FingerprintSensorProperties.TYPE_POWER_BUTTON,
            false /* halControlsIllumination */,
+            false /* halHandlesDisplayTouches */,
            true /* resetLockoutRequiresHardwareAuthToken */,
            listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
          )
--- a/tests/unit/src/com/android/settings/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollEnrollingViewModelTest.kt
+++ b/tests/unit/src/com/android/settings/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollEnrollingViewModelTest.kt
@@ -75,6 +75,7 @@ class FingerprintEnrollEnrollingViewModelTest {
          listOf<ComponentInfoInternal>(),
          FingerprintSensorProperties.TYPE_POWER_BUTTON,
          false /* halControlsIllumination */,
+          false /* halHandlesDisplayTouches */,
          true /* resetLockoutRequiresHardwareAuthToken */,
          listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
        )
--- a/tests/unit/src/com/android/settings/fingerprint2/ui/settings/FingerprintSettingsViewModelTest.kt
+++ b/tests/unit/src/com/android/settings/fingerprint2/ui/settings/FingerprintSettingsViewModelTest.kt
@@ -112,6 +112,7 @@ class FingerprintSettingsViewModelTest {
            listOf<ComponentInfoInternal>(),
            FingerprintSensorProperties.TYPE_UDFPS_OPTICAL,
            false /* halControlsIllumination */,
+            false /* halHandlesDisplayTouches */,
            true /* resetLockoutRequiresHardwareAuthToken */,
            listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
          )
@@ -147,6 +148,7 @@ class FingerprintSettingsViewModelTest {
            listOf<ComponentInfoInternal>(),
            FingerprintSensorProperties.TYPE_UDFPS_ULTRASONIC,
            false /* halControlsIllumination */,
+            false /* halHandlesDisplayTouches */,
            true /* resetLockoutRequiresHardwareAuthToken */,
            listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
          )
@@ -180,6 +182,7 @@ class FingerprintSettingsViewModelTest {
            listOf<ComponentInfoInternal>(),
            FingerprintSensorProperties.TYPE_POWER_BUTTON,
            false /* halControlsIllumination */,
+            false /* halHandlesDisplayTouches */,
            true /* resetLockoutRequiresHardwareAuthToken */,
            listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
          )
@@ -379,6 +382,7 @@ class FingerprintSettingsViewModelTest {
          listOf<ComponentInfoInternal>(),
          FingerprintSensorProperties.TYPE_POWER_BUTTON,
          false /* halControlsIllumination */,
+          false /* halHandlesDisplayTouches */,
          true /* resetLockoutRequiresHardwareAuthToken */,
          listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT),
        )