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

RESTRICT AUTOMERGE Remove ScrimController from BiometricUnlockController am: 9a21ac1be1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20691779

Change-Id: I6833c191ca59a62fc933fad2d179a93d559677f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly
2022-12-14 15:42:50 +00:00
committed by Automerger Merge Worker
parent 8133f23e18 9a21ac1be1
commit 35915a4584
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,6 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
private KeyguardViewController mKeyguardViewController; private KeyguardViewController mKeyguardViewController;
private DozeScrimController mDozeScrimController; private DozeScrimController mDozeScrimController;
private KeyguardViewMediator mKeyguardViewMediator; private KeyguardViewMediator mKeyguardViewMediator;
private ScrimController mScrimController;
private PendingAuthenticated mPendingAuthenticated = null; private PendingAuthenticated mPendingAuthenticated = null;
private boolean mHasScreenTurnedOnSinceAuthenticating; private boolean mHasScreenTurnedOnSinceAuthenticating;
private boolean mFadedAwayAfterWakeAndUnlock; private boolean mFadedAwayAfterWakeAndUnlock;
@@ -261,7 +260,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
@Inject @Inject
public BiometricUnlockController( public BiometricUnlockController(
DozeScrimController dozeScrimController, DozeScrimController dozeScrimController,
KeyguardViewMediator keyguardViewMediator, ScrimController scrimController, KeyguardViewMediator keyguardViewMediator,
ShadeController shadeController, ShadeController shadeController,
NotificationShadeWindowController notificationShadeWindowController, NotificationShadeWindowController notificationShadeWindowController,
KeyguardStateController keyguardStateController, Handler handler, KeyguardStateController keyguardStateController, Handler handler,
@@ -293,7 +292,6 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
mNotificationShadeWindowController = notificationShadeWindowController; mNotificationShadeWindowController = notificationShadeWindowController;
mDozeScrimController = dozeScrimController; mDozeScrimController = dozeScrimController;
mKeyguardViewMediator = keyguardViewMediator; mKeyguardViewMediator = keyguardViewMediator;
mScrimController = scrimController;
mKeyguardStateController = keyguardStateController; mKeyguardStateController = keyguardStateController;
mHandler = handler; mHandler = handler;
mConsecutiveFpFailureThreshold = resources.getInteger( mConsecutiveFpFailureThreshold = resources.getInteger(
@@ -375,12 +373,6 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
Trace.endSection(); Trace.endSection();
} }
private boolean pulsingOrAod() {
final ScrimState scrimState = mScrimController.getState();
return scrimState == ScrimState.AOD
|| scrimState == ScrimState.PULSING;
}
@Override @Override
public void onBiometricAuthenticated(int userId, BiometricSourceType biometricSourceType, public void onBiometricAuthenticated(int userId, BiometricSourceType biometricSourceType,
boolean isStrongBiometric) { boolean isStrongBiometric) {
@@ -425,7 +417,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
boolean wasDeviceInteractive = mUpdateMonitor.isDeviceInteractive(); boolean wasDeviceInteractive = mUpdateMonitor.isDeviceInteractive();
mMode = mode; mMode = mode;
mHasScreenTurnedOnSinceAuthenticating = false; mHasScreenTurnedOnSinceAuthenticating = false;
if (mMode == MODE_WAKE_AND_UNLOCK_PULSING && pulsingOrAod()) { if (mMode == MODE_WAKE_AND_UNLOCK_PULSING) {
// If we are waking the device up while we are pulsing the clock and the // If we are waking the device up while we are pulsing the clock and the
// notifications would light up first, creating an unpleasant animation. // notifications would light up first, creating an unpleasant animation.
// Defer changing the screen brightness by forcing doze brightness on our window // Defer changing the screen brightness by forcing doze brightness on our window

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

@@ -89,8 +89,6 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
@Mock @Mock
private KeyguardViewMediator mKeyguardViewMediator; private KeyguardViewMediator mKeyguardViewMediator;
@Mock @Mock
private ScrimController mScrimController;
@Mock
private BiometricUnlockController.BiometricModeListener mBiometricModeListener; private BiometricUnlockController.BiometricModeListener mBiometricModeListener;
@Mock @Mock
private ShadeController mShadeController; private ShadeController mShadeController;
@@ -140,7 +138,7 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
when(mVibratorHelper.hasVibrator()).thenReturn(true); when(mVibratorHelper.hasVibrator()).thenReturn(true);
mDependency.injectTestDependency(NotificationMediaManager.class, mMediaManager); mDependency.injectTestDependency(NotificationMediaManager.class, mMediaManager);
mBiometricUnlockController = new BiometricUnlockController(mDozeScrimController, mBiometricUnlockController = new BiometricUnlockController(mDozeScrimController,
mKeyguardViewMediator, mScrimController, mShadeController, mKeyguardViewMediator, mShadeController,
mNotificationShadeWindowController, mKeyguardStateController, mHandler, mNotificationShadeWindowController, mKeyguardStateController, mHandler,
mUpdateMonitor, res.getResources(), mKeyguardBypassController, mUpdateMonitor, res.getResources(), mKeyguardBypassController,
mMetricsLogger, mDumpManager, mPowerManager, mLogger, mMetricsLogger, mDumpManager, mPowerManager, mLogger,