Merge "Retry fingerprint or face unlock" into tm-qpr-dev am: c1d0d230d4 am: 96f959737c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188600 Change-Id: I9c05b7bf43304fead4ae03a23a5106afe55612f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Milton Wu
Automerger Merge Worker
@@ -0,0 +1,358 @@
|
||||
/*
|
||||
* Copyright (C) 2022 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.combination;
|
||||
|
||||
import static com.android.settings.biometrics.combination.BiometricsSettingsBase.CONFIRM_REQUEST;
|
||||
import static com.android.settings.password.ChooseLockPattern.RESULT_FINISHED;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.Mockito.doAnswer;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.doThrow;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.hardware.face.FaceManager;
|
||||
import android.hardware.fingerprint.FingerprintManager;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.XmlRes;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.password.ChooseLockSettingsHelper;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.shadow.ShadowFragment;
|
||||
import com.android.settings.testutils.shadow.ShadowSettingsPreferenceFragment;
|
||||
import com.android.settings.testutils.shadow.ShadowUtils;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Captor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.Robolectric;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = {ShadowSettingsPreferenceFragment.class, ShadowUtils.class, ShadowFragment.class})
|
||||
public class CombinedBiometricProfileSettingsTest {
|
||||
|
||||
private TestCombinedBiometricProfileSettings mFragment;
|
||||
private Context mContext;
|
||||
|
||||
@Rule
|
||||
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Captor
|
||||
private ArgumentCaptor<Preference> mPreferenceCaptor;
|
||||
@Mock
|
||||
private FingerprintManager mFingerprintManager;
|
||||
@Mock
|
||||
private BiometricSettingsAppPreferenceController mBiometricSettingsAppPreferenceController;
|
||||
@Mock
|
||||
private FaceManager mFaceManager;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
ShadowUtils.setFingerprintManager(mFingerprintManager);
|
||||
ShadowUtils.setFaceManager(mFaceManager);
|
||||
FakeFeatureFactory.setupForTest();
|
||||
|
||||
FragmentActivity activity = Robolectric.buildActivity(FragmentActivity.class,
|
||||
new Intent().putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, 1L)).get();
|
||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
mFragment = spy(new TestCombinedBiometricProfileSettings(mContext));
|
||||
doReturn(activity).when(mFragment).getActivity();
|
||||
|
||||
ReflectionHelpers.setField(mFragment, "mDashboardFeatureProvider",
|
||||
FakeFeatureFactory.setupForTest().dashboardFeatureProvider);
|
||||
|
||||
final Map<Class<?>, List<AbstractPreferenceController>> preferenceControllers =
|
||||
ReflectionHelpers.getField(mFragment, "mPreferenceControllers");
|
||||
List<AbstractPreferenceController> controllerList = new ArrayList<>();
|
||||
controllerList.add(mBiometricSettingsAppPreferenceController);
|
||||
preferenceControllers.put(BiometricSettingsAppPreferenceController.class, controllerList);
|
||||
|
||||
doAnswer(invocation -> {
|
||||
final CharSequence key = invocation.getArgument(0);
|
||||
final Preference preference = new Preference(mContext);
|
||||
preference.setKey(key.toString());
|
||||
return preference;
|
||||
}).when(mFragment).findPreference(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testClickFingerprintUnlockWithValidGkPwHandle() {
|
||||
doAnswer(invocation -> {
|
||||
final FingerprintManager.GenerateChallengeCallback callback =
|
||||
invocation.getArgument(1);
|
||||
callback.onChallengeGenerated(0, 0, 1L);
|
||||
return null;
|
||||
}).when(mFingerprintManager).generateChallenge(anyInt(), any());
|
||||
doReturn(new byte[] { 1 }).when(mFragment).requestGatekeeperHat(any(), anyLong(), anyInt(),
|
||||
anyLong());
|
||||
|
||||
// Start fragment
|
||||
mFragment.onAttach(mContext);
|
||||
mFragment.onCreate(null);
|
||||
mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
|
||||
mFragment.onResume();
|
||||
|
||||
// User clicks on "Fingerprint Unlock"
|
||||
final Preference preference = new Preference(mContext);
|
||||
preference.setKey(mFragment.getFingerprintPreferenceKey());
|
||||
mFragment.onPreferenceTreeClick(preference);
|
||||
|
||||
verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
|
||||
mPreferenceCaptor.capture());
|
||||
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
|
||||
|
||||
assertThat(capturedPreferences.size()).isEqualTo(1);
|
||||
assertThat(capturedPreferences.get(0).getKey())
|
||||
.isEqualTo(mFragment.getFingerprintPreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testClickFingerprintUnlockIfGkPwHandleTimeout() {
|
||||
doAnswer(invocation -> {
|
||||
final FingerprintManager.GenerateChallengeCallback callback =
|
||||
invocation.getArgument(1);
|
||||
callback.onChallengeGenerated(0, 0, 1L);
|
||||
return null;
|
||||
}).when(mFingerprintManager).generateChallenge(anyInt(), any());
|
||||
doThrow(new IllegalStateException("Test")).when(mFragment).requestGatekeeperHat(any(),
|
||||
anyLong(), anyInt(), anyLong());
|
||||
|
||||
// Start fragment
|
||||
mFragment.onAttach(mContext);
|
||||
mFragment.onCreate(null);
|
||||
mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
|
||||
mFragment.onResume();
|
||||
|
||||
// User clicks on "Fingerprint Unlock"
|
||||
final Preference preference = new Preference(mContext);
|
||||
preference.setKey(mFragment.getFingerprintPreferenceKey());
|
||||
mFragment.onPreferenceTreeClick(preference);
|
||||
|
||||
verify(mFragment).launchChooseOrConfirmLock();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testActivityResultLaunchFingerprintUnlock() {
|
||||
doAnswer(invocation -> {
|
||||
final FingerprintManager.GenerateChallengeCallback callback =
|
||||
invocation.getArgument(1);
|
||||
callback.onChallengeGenerated(0, 0, 1L);
|
||||
return null;
|
||||
}).when(mFingerprintManager).generateChallenge(anyInt(), any());
|
||||
doReturn(new byte[] { 1 }).when(mFragment).requestGatekeeperHat(any(), anyLong(), anyInt(),
|
||||
anyLong());
|
||||
|
||||
// Start fragment
|
||||
mFragment.onAttach(mContext);
|
||||
final Bundle bundle = new Bundle();
|
||||
bundle.putString(BiometricsSettingsBase.RETRY_PREFERENCE_KEY,
|
||||
mFragment.getFingerprintPreferenceKey());
|
||||
final Bundle retryBundle = new Bundle();
|
||||
bundle.putBundle(BiometricsSettingsBase.RETRY_PREFERENCE_BUNDLE, retryBundle);
|
||||
mFragment.onCreate(bundle);
|
||||
mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
|
||||
mFragment.onResume();
|
||||
|
||||
// onActivityResult
|
||||
mFragment.onActivityResult(CONFIRM_REQUEST, RESULT_FINISHED,
|
||||
new Intent().putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, 1L));
|
||||
|
||||
verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
|
||||
mPreferenceCaptor.capture());
|
||||
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
|
||||
assertThat(capturedPreferences.size()).isEqualTo(1);
|
||||
assertThat(capturedPreferences.get(0).getKey())
|
||||
.isEqualTo(mFragment.getFingerprintPreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testClickFaceUnlock() {
|
||||
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());
|
||||
|
||||
// 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);
|
||||
|
||||
verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
|
||||
mPreferenceCaptor.capture());
|
||||
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
|
||||
assertThat(capturedPreferences.size()).isEqualTo(1);
|
||||
assertThat(capturedPreferences.get(0).getKey()).isEqualTo(mFragment.getFacePreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testClickFaceUnlockIfGkPwHandleTimeout() {
|
||||
doAnswer(invocation -> {
|
||||
final FaceManager.GenerateChallengeCallback callback =
|
||||
invocation.getArgument(1);
|
||||
callback.onGenerateChallengeResult(0, 0, 1L);
|
||||
return null;
|
||||
}).when(mFaceManager).generateChallenge(anyInt(), any());
|
||||
doThrow(new IllegalStateException("Test")).when(mFragment).requestGatekeeperHat(any(),
|
||||
anyLong(), anyInt(), anyLong());
|
||||
|
||||
// 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);
|
||||
|
||||
verify(mFragment).launchChooseOrConfirmLock();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testActivityResultLaunchFaceUnlock() {
|
||||
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());
|
||||
|
||||
// Start fragment
|
||||
mFragment.onAttach(mContext);
|
||||
final Bundle bundle = new Bundle();
|
||||
bundle.putString(BiometricsSettingsBase.RETRY_PREFERENCE_KEY,
|
||||
mFragment.getFingerprintPreferenceKey());
|
||||
final Bundle retryBundle = new Bundle();
|
||||
bundle.putBundle(BiometricsSettingsBase.RETRY_PREFERENCE_BUNDLE, retryBundle);
|
||||
mFragment.onCreate(bundle);
|
||||
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);
|
||||
|
||||
verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
|
||||
mPreferenceCaptor.capture());
|
||||
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
|
||||
assertThat(capturedPreferences.size()).isEqualTo(1);
|
||||
assertThat(capturedPreferences.get(0).getKey()).isEqualTo(mFragment.getFacePreferenceKey());
|
||||
}
|
||||
|
||||
/**
|
||||
* a test fragment that initializes PreferenceScreen for testing.
|
||||
*/
|
||||
static class TestCombinedBiometricProfileSettings extends CombinedBiometricProfileSettings {
|
||||
|
||||
private final Context mContext;
|
||||
private final PreferenceManager mPreferenceManager;
|
||||
|
||||
TestCombinedBiometricProfileSettings(Context context) {
|
||||
super();
|
||||
mContext = context;
|
||||
mPreferenceManager = new PreferenceManager(context);
|
||||
mPreferenceManager.setPreferences(mPreferenceManager.createPreferenceScreen(context));
|
||||
setArguments(new Bundle());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPreferenceScreenResId() {
|
||||
return R.xml.placeholder_prefs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceScreen getPreferenceScreen() {
|
||||
return mPreferenceManager.getPreferenceScreen();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceManager getPreferenceManager() {
|
||||
return mPreferenceManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addPreferencesFromResource(@XmlRes int preferencesResId) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
public Context getContext() {
|
||||
return mContext;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void launchChooseOrConfirmLock() {
|
||||
// do nothing
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -31,6 +31,7 @@ import android.hardware.face.FaceManager;
|
||||
import android.os.UserManager;
|
||||
import android.provider.Settings;
|
||||
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.shadow.ShadowUtils;
|
||||
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
|
||||
import com.android.settingslib.RestrictedSwitchPreference;
|
||||
@@ -65,6 +66,9 @@ public class FaceSettingsLockscreenBypassPreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
ShadowUtils.setFaceManager(mFaceManager);
|
||||
FakeFeatureFactory.setupForTest();
|
||||
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
when(mContext.getSystemService(eq(Context.FACE_SERVICE))).thenReturn(mFaceManager);
|
||||
when(mContext.getPackageManager()).thenReturn(mPackageManager);
|
||||
|
||||
@@ -22,6 +22,7 @@ import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.drawable.ColorDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.hardware.face.FaceManager;
|
||||
import android.hardware.fingerprint.FingerprintManager;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
@@ -39,6 +40,7 @@ import java.util.Map;
|
||||
public class ShadowUtils {
|
||||
|
||||
private static FingerprintManager sFingerprintManager = null;
|
||||
private static FaceManager sFaceManager = null;
|
||||
private static boolean sIsUserAMonkey;
|
||||
private static boolean sIsDemoUser;
|
||||
private static ComponentName sDeviceOwnerComponentName;
|
||||
@@ -63,6 +65,15 @@ public class ShadowUtils {
|
||||
sFingerprintManager = fingerprintManager;
|
||||
}
|
||||
|
||||
@Implementation
|
||||
protected static FaceManager getFaceManagerOrNull(Context context) {
|
||||
return sFaceManager;
|
||||
}
|
||||
|
||||
public static void setFaceManager(FaceManager faceManager) {
|
||||
sFaceManager = faceManager;
|
||||
}
|
||||
|
||||
public static void reset() {
|
||||
sFingerprintManager = null;
|
||||
sIsUserAMonkey = false;
|
||||
|
||||
Reference in New Issue
Block a user