PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be4d am: a27d94d75d

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

Change-Id: I25f7d00d306b00b1c144d4f1e12478d3276f379d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hao Dong
2023-04-10 19:45:32 +00:00
committed by Automerger Merge Worker
parent 5041611155 a27d94d75d
commit 40d69e3ce5
9 changed files with 314 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
View File

@@ -16,11 +16,9 @@
package com.android.settings.biometrics.combination;
import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON;
import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;
import static com.android.settings.biometrics.combination.BiometricsSettingsBase.CONFIRM_REQUEST;
import static com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
import static com.android.settings.password.ChooseLockPattern.RESULT_FINISHED;
import static com.google.common.truth.Truth.assertThat;
@@ -35,7 +33,6 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import android.content.Context;
@@ -44,7 +41,6 @@ import android.hardware.biometrics.ComponentInfoInternal;
import android.hardware.biometrics.SensorProperties;
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintSensorProperties;
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -62,6 +58,7 @@ import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.biometrics.BiometricsSplitScreenDialog;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowFragment;
@@ -322,46 +319,24 @@ public class CombinedBiometricProfileSettingsTest {
}
@Test
public void testClickFingerprintUnlockInMultiWindow_onUdfpsDevice_withoutEnrolledFp_showsDialog() {
clickFingerprintUnlockInSplitScreenMode(TYPE_UDFPS_OPTICAL, /*hasEnrolledFingerprint*/
false);
verify(mBiometricSettingsAppPreferenceController, times(0)).handlePreferenceTreeClick(
any());
verify(mFragmentTransaction).add(any(),
eq(FingerprintSettingsFragment.FingerprintSplitScreenDialog.class.getName()));
public void testClickFingerprintUnlock_inMultiWindow_withoutEnrolledFp_showsDialog() {
testClickFingerprintUnlock(true /* isInMultiWindow */, false /* hasEnrolledFingerprint */);
verifyShowsDialogAfterClickingUnlock();
}
@Test
public void testClickFingerprintUnlockInMultiWindow_onUdfpsDevice_withEnrolledFp_noDialog() {
clickFingerprintUnlockInSplitScreenMode(TYPE_UDFPS_OPTICAL, /*hasEnrolledFingerprint*/true);
verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
mPreferenceCaptor.capture());
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
assertThat(capturedPreferences.size()).isEqualTo(1);
assertThat(capturedPreferences.get(0).getKey()).isEqualTo(
mFragment.getFingerprintPreferenceKey());
verify(mFragmentTransaction, never()).add(any(),
eq(FingerprintSettingsFragment.FingerprintSplitScreenDialog.class.getName()));
public void testClickFingerprintUnlock_inMultiWindow_withEnrolledFp_noDialog() {
testClickFingerprintUnlock(true /* isInMultiWindow */, true /* hasEnrolledFingerprint */);
verifyNoDialogAfterClickingUnlock(mFragment.getFingerprintPreferenceKey());
}
@Test
public void testClickFingerprintUnlockInMultiWindow_onSfpsDevice_withoutEnrolledFp_noDialog() {
clickFingerprintUnlockInSplitScreenMode(TYPE_POWER_BUTTON, /*hasEnrolledFingerprint*/false);
verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
mPreferenceCaptor.capture());
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
assertThat(capturedPreferences.size()).isEqualTo(1);
assertThat(capturedPreferences.get(0).getKey()).isEqualTo(
mFragment.getFingerprintPreferenceKey());
verify(mFragmentTransaction, never()).add(any(),
eq(FingerprintSettingsFragment.FingerprintSplitScreenDialog.class.getName()));
public void testClickFingerprintUnlock_inFullScreen_withoutEnrolledFp_noDialog() {
testClickFingerprintUnlock(false /* isInMultiWindow */, false /* hasEnrolledFingerprint */);
verifyNoDialogAfterClickingUnlock(mFragment.getFingerprintPreferenceKey());
}
private void clickFingerprintUnlockInSplitScreenMode(
@FingerprintSensorProperties.SensorType int sensorType,
private void testClickFingerprintUnlock(boolean isInMultiWindow,
boolean hasEnrolledFingerprint) {
final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
props.add(new FingerprintSensorPropertiesInternal(
@@ -369,7 +344,7 @@ public class CombinedBiometricProfileSettingsTest {
SensorProperties.STRENGTH_STRONG,
1 /* maxEnrollmentsPerUser */,
new ArrayList<ComponentInfoInternal>(),
sensorType,
TYPE_UDFPS_OPTICAL,
true /* resetLockoutRequiresHardwareAuthToken */));
doReturn(props).when(mFingerprintManager).getSensorPropertiesInternal();
@@ -384,7 +359,7 @@ public class CombinedBiometricProfileSettingsTest {
FragmentManager fragmentManager = mock(FragmentManager.class);
doReturn(fragmentManager).when(mActivity).getSupportFragmentManager();
doReturn(mFragmentTransaction).when(fragmentManager).beginTransaction();
doReturn(true).when(mActivity).isInMultiWindowMode();
doReturn(isInMultiWindow).when(mActivity).isInMultiWindowMode();
doReturn(hasEnrolledFingerprint).when(mFingerprintManager).hasEnrolledFingerprints(
anyInt());
@@ -399,6 +374,69 @@ public class CombinedBiometricProfileSettingsTest {
preference.setKey(mFragment.getFingerprintPreferenceKey());
mFragment.onPreferenceTreeClick(preference);
}
@Test
public void testClickFaceUnlock_inMultiWindow_withoutEnrolledFp_showsDialog() {
testClickFaceUnlock(true /* isInMultiWindow */, false /*hasEnrolledFace*/);
verifyShowsDialogAfterClickingUnlock();
}
@Test
public void testClickFaceUnlock_inMultiWindow_withEnrolledFp_noDialog() {
testClickFaceUnlock(true /* isInMultiWindow */, true /* hasEnrolledFace */);
verifyNoDialogAfterClickingUnlock(mFragment.getFacePreferenceKey());
}
@Test
public void testClickFaceUnlock_inFullScreen_withoutEnrolledFp_noDialog() {
testClickFaceUnlock(false /* isInMultiWindow */ , false /* hasEnrolledFace */);
verifyNoDialogAfterClickingUnlock(mFragment.getFacePreferenceKey());
}
private void testClickFaceUnlock(boolean isInMultiWindow, boolean hasEnrolledFace) {
doAnswer(invocation -> {
final FaceManager.GenerateChallengeCallback callback =
invocation.getArgument(1);
callback.onGenerateChallengeResult(0, 0, 1L);
return null;
}).when(mFaceManager).generateChallenge(anyInt(), any());
doReturn(new byte[] { 1 }).when(mFragment).requestGatekeeperHat(any(), anyLong(), anyInt(),
anyLong());
FragmentManager fragmentManager = mock(FragmentManager.class);
doReturn(fragmentManager).when(mActivity).getSupportFragmentManager();
doReturn(mFragmentTransaction).when(fragmentManager).beginTransaction();
doReturn(isInMultiWindow).when(mActivity).isInMultiWindowMode();
doReturn(hasEnrolledFace).when(mFaceManager).hasEnrolledTemplates(
anyInt());
// Start fragment
mFragment.onAttach(mContext);
mFragment.onCreate(null);
mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
mFragment.onResume();
// User clicks on "Face Unlock"
final Preference preference = new Preference(mContext);
preference.setKey(mFragment.getFacePreferenceKey());
mFragment.onPreferenceTreeClick(preference);
}
private void verifyNoDialogAfterClickingUnlock(String preferenceKey) {
verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
mPreferenceCaptor.capture());
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
assertThat(capturedPreferences).hasSize(1);
assertThat(capturedPreferences.get(0).getKey()).isEqualTo(preferenceKey);
verify(mFragmentTransaction, never()).add(any(),
eq(BiometricsSplitScreenDialog.class.getName()));
}
private void verifyShowsDialogAfterClickingUnlock() {
verify(mBiometricSettingsAppPreferenceController, never()).handlePreferenceTreeClick(any());
verify(mFragmentTransaction).add(any(),
eq(BiometricsSplitScreenDialog.class.getName()));
}
/**
* a test fragment that initializes PreferenceScreen for testing.
*/

44
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.biometrics.fingerprint;
import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON;
import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;
import static com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
@@ -40,7 +39,6 @@ import android.content.Intent;
import android.hardware.biometrics.ComponentInfoInternal;
import android.hardware.biometrics.SensorProperties;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintSensorProperties;
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -52,6 +50,7 @@ import androidx.fragment.app.FragmentTransaction;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.biometrics.BiometricsSplitScreenDialog;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowFragment;
@@ -111,6 +110,8 @@ public class FingerprintSettingsFragmentTest {
doReturn(fragmentManager).when(mActivity).getSupportFragmentManager();
doNothing().when(mFragment).startActivityForResult(any(Intent.class), anyInt());
setSensor();
}
@After
@@ -119,9 +120,7 @@ public class FingerprintSettingsFragmentTest {
}
@Test
public void testAddFingerprint_onUdfpsDevice_inFullScreen_noDialog() {
setSensorType(TYPE_UDFPS_OPTICAL);
public void testAddFingerprint_inFullScreen_noDialog() {
// Start fragment
mFragment.onAttach(mContext);
mFragment.onCreate(null);
@@ -135,14 +134,12 @@ public class FingerprintSettingsFragmentTest {
verify(mFragment).startActivityForResult(any(), eq(ADD_FINGERPRINT_REQUEST));
verify(mFragmentTransaction, never()).add(any(),
eq(FingerprintSettingsFragment.FingerprintSplitScreenDialog.class.getName()));
eq(BiometricsSplitScreenDialog.class.getName()));
}
@Test
public void testAddFingerprint_onUdfpsDevice_inMultiWindow_showsDialog() {
setSensorType(TYPE_UDFPS_OPTICAL);
public void testAddFingerprint_inMultiWindow_showsDialog() {
// Start fragment
mFragment.onAttach(mContext);
mFragment.onCreate(null);
@@ -157,40 +154,17 @@ public class FingerprintSettingsFragmentTest {
mFragment.onPreferenceTreeClick(preference);
verify(mFragment, times(0)).startActivityForResult(any(), eq(ADD_FINGERPRINT_REQUEST));
verify(mFragmentTransaction).add(any(),
eq(FingerprintSettingsFragment.FingerprintSplitScreenDialog.class.getName()));
verify(mFragmentTransaction).add(any(), eq(BiometricsSplitScreenDialog.class.getName()));
}
@Test
public void testAddFingerprint_onSfpsDevice_inMultiWindow_noDialog() {
setSensorType(TYPE_POWER_BUTTON);
// Start fragment
mFragment.onAttach(mContext);
mFragment.onCreate(null);
mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
mFragment.onResume();
doReturn(true).when(mActivity).isInMultiWindowMode();
// Click "Add Fingerprint"
final Preference preference = new Preference(mContext);
preference.setKey(KEY_FINGERPRINT_ADD);
mFragment.onPreferenceTreeClick(preference);
verify(mFragment).startActivityForResult(any(), eq(ADD_FINGERPRINT_REQUEST));
verify(mFragmentTransaction, never()).add(any(),
eq(FingerprintSettingsFragment.FingerprintSplitScreenDialog.class.getName()));
}
private void setSensorType(@FingerprintSensorProperties.SensorType int sensorType) {
private void setSensor() {
final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
props.add(new FingerprintSensorPropertiesInternal(
0 /* sensorId */,
SensorProperties.STRENGTH_STRONG,
1 /* maxEnrollmentsPerUser */,
new ArrayList<ComponentInfoInternal>(),
sensorType,
TYPE_UDFPS_OPTICAL,
true /* resetLockoutRequiresHardwareAuthToken */));
doReturn(props).when(mFingerprintManager).getSensorPropertiesInternal();
}

80
tests/unit/src/com/android/settings/biometrics/face/FaceSettingsEnrollButtonPreferenceControllerTest.java Normal file
View File

@@ -0,0 +1,80 @@
/*
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.biometrics.face;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.widget.Button;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@RunWith(AndroidJUnit4.class)
public class FaceSettingsEnrollButtonPreferenceControllerTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Mock
private Context mContext;
@Mock
private Button mButton;
@Mock
private FaceSettingsEnrollButtonPreferenceController.Listener mListener;
private FaceSettingsEnrollButtonPreferenceController mController;
@Before
public void setUp() {
mController = new FaceSettingsEnrollButtonPreferenceController(mContext);
mController.setListener(mListener);
}
@Test
public void isSliceable_returnFalse() {
assertThat(mController.isSliceable()).isFalse();
}
@Test
public void testOnClick_inFullScreen() {
when(mListener.checkInMultiWindowMode()).thenReturn(false);
mController.onClick(mButton);
assertThat(mController.isClicked()).isTrue();
verify(mListener).onStartEnrolling(any());
}
@Test
public void testOnClick_inMultiWindow() {
when(mListener.checkInMultiWindowMode()).thenReturn(true);
mController.onClick(mButton);
assertThat(mController.isClicked()).isFalse();
verify(mListener, never()).onStartEnrolling(any());
}
}