Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix LockSettingsServiceTest" into sc-dev

Browse Source
This commit is contained in:
Rubin Xu
2021-04-16 21:19:40 +00:00
committed by Android (Google) Code Review
parent 3c8f9e1f1a cba2ce26c2
commit de9d0b0ead
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java
View File

@@ -36,9 +36,7 @@ import android.content.ComponentName;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.hardware.authsecret.V1_0.IAuthSecret; import android.hardware.authsecret.V1_0.IAuthSecret;
import android.hardware.face.Face;
import android.hardware.face.FaceManager; import android.hardware.face.FaceManager;
import android.hardware.fingerprint.Fingerprint;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.os.FileUtils; import android.os.FileUtils;
import android.os.IProgressListener; import android.os.IProgressListener;
@@ -261,13 +259,12 @@ public abstract class BaseLockSettingsServiceTests {
doAnswer(new Answer<Void>() { doAnswer(new Answer<Void>() {
@Override @Override
public Void answer(InvocationOnMock invocation) throws Throwable { public Void answer(InvocationOnMock invocation) throws Throwable {
Fingerprint fp = (Fingerprint) invocation.getArguments()[0];
FingerprintManager.RemovalCallback callback = FingerprintManager.RemovalCallback callback =
(FingerprintManager.RemovalCallback) invocation.getArguments()[2]; (FingerprintManager.RemovalCallback) invocation.getArguments()[1];
callback.onRemovalSucceeded(fp, 0); callback.onRemovalSucceeded(null, 0);
return null; return null;
} }
}).when(mFingerprintManager).remove(any(), eq(userId), any()); }).when(mFingerprintManager).removeAll(eq(userId), any());
// Hardware must be detected and templates must be enrolled // Hardware must be detected and templates must be enrolled
@@ -277,13 +274,12 @@ public abstract class BaseLockSettingsServiceTests {
doAnswer(new Answer<Void>() { doAnswer(new Answer<Void>() {
@Override @Override
public Void answer(InvocationOnMock invocation) throws Throwable { public Void answer(InvocationOnMock invocation) throws Throwable {
Face face = (Face) invocation.getArguments()[0];
FaceManager.RemovalCallback callback = FaceManager.RemovalCallback callback =
(FaceManager.RemovalCallback) invocation.getArguments()[2]; (FaceManager.RemovalCallback) invocation.getArguments()[1];
callback.onRemovalSucceeded(face, 0); callback.onRemovalSucceeded(null, 0);
return null; return null;
} }
}).when(mFaceManager).remove(any(), eq(userId), any()); }).when(mFaceManager).removeAll(eq(userId), any());
} }
@After @After