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

Merge "Fix race condition" into rvc-dev am: 3f634b45e1

Browse Source 
Change-Id: I90ba8770728c76460bff246e7d8f235006a25ef5
This commit is contained in:
Automerger Merge Worker
2020-03-04 06:05:56 +00:00
parent 89f35ee572 3f634b45e1
commit 0faf16cd31
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
View File

@@ -394,10 +394,11 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
public void onFinishedGoingToSleep(int why) { public void onFinishedGoingToSleep(int why) {
Trace.beginSection("BiometricUnlockController#onFinishedGoingToSleep"); Trace.beginSection("BiometricUnlockController#onFinishedGoingToSleep");
if (mPendingAuthenticated != null) { if (mPendingAuthenticated != null) {
PendingAuthenticated pendingAuthenticated = mPendingAuthenticated;
// Post this to make sure it's executed after the device is fully locked. // Post this to make sure it's executed after the device is fully locked.
mHandler.post(() -> onBiometricAuthenticated(mPendingAuthenticated.userId, mHandler.post(() -> onBiometricAuthenticated(pendingAuthenticated.userId,
mPendingAuthenticated.biometricSourceType, pendingAuthenticated.biometricSourceType,
mPendingAuthenticated.isStrongBiometric)); pendingAuthenticated.isStrongBiometric));
mPendingAuthenticated = null; mPendingAuthenticated = null;
} }
Trace.endSection(); Trace.endSection();

5
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java
View File

@@ -48,6 +48,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
@@ -325,11 +326,13 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
mBiometricUnlockController.onFinishedGoingToSleep(-1); mBiometricUnlockController.onFinishedGoingToSleep(-1);
verify(mHandler, never()).post(any()); verify(mHandler, never()).post(any());
ArgumentCaptor<Runnable> captor = ArgumentCaptor.forClass(Runnable.class);
// the value of isStrongBiometric doesn't matter here since we only care about the returned // the value of isStrongBiometric doesn't matter here since we only care about the returned
// value of isUnlockingWithBiometricAllowed() // value of isUnlockingWithBiometricAllowed()
mBiometricUnlockController.onBiometricAuthenticated(1 /* userId */, mBiometricUnlockController.onBiometricAuthenticated(1 /* userId */,
BiometricSourceType.FACE, true /* isStrongBiometric */); BiometricSourceType.FACE, true /* isStrongBiometric */);
mBiometricUnlockController.onFinishedGoingToSleep(-1); mBiometricUnlockController.onFinishedGoingToSleep(-1);
verify(mHandler).post(any()); verify(mHandler).post(captor.capture());
captor.getValue().run();
} }
} }