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

Update Settings together with generateChallenge/revokeChallenge

Browse Source 
The internal implementation of generate/revoke in system_server is now
asynchronous. To keep existing clients working, the manager classes
introduce a blocking version of the generateChallenge calls. This change
updates Settings to use the backward-compatible blocking calls.

Bug: 157790417

Test: Enroll fingerprint/face
Test: After enrollment, toggle setFeature or do subsequent enrollment
      in face/fingerprint settings
Change-Id: Ib4dfdc5f12530b938ab9b1745f5a19cd9e2eceee
This commit is contained in:
Kevin Chyn
2020-06-24 17:58:03 -07:00
parent 602b8573f3
commit cbe32ed1cf
8 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
View File

@@ -80,10 +80,10 @@ public final class SetNewPasswordControllerTest {
CURRENT_USER_ID, mPackageManager, mFingerprintManager, mFaceManager,
mDevicePolicyManager, mUi);
when(mFingerprintManager.preEnroll()).thenReturn(FINGERPRINT_CHALLENGE);
when(mFingerprintManager.generateChallengeBlocking()).thenReturn(FINGERPRINT_CHALLENGE);
when(mPackageManager.hasSystemFeature(eq(FEATURE_FINGERPRINT))).thenReturn(true);
when(mFaceManager.generateChallenge()).thenReturn(FACE_CHALLENGE);
when(mFaceManager.generateChallengeBlocking()).thenReturn(FACE_CHALLENGE);
when(mPackageManager.hasSystemFeature(eq(FEATURE_FACE))).thenReturn(true);
}

5
tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
View File

@@ -31,4 +31,9 @@ public class ShadowFingerprintManager extends org.robolectric.shadows.ShadowFing
protected List<Fingerprint> getEnrolledFingerprints(int userId) {
return getEnrolledFingerprints();
}
@Implementation
protected long generateChallengeBlocking() {
return 0L;
}
}