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

Merge "Remove dead code from KeyguardUpdateMonitor" into tm-qpr-dev

Browse Source
This commit is contained in:
Chandru S
2022-07-15 07:17:36 +00:00
committed by Android (Google) Code Review
parent 1e7afc3a20 e1df01d400
commit 0125a70c73
3 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/keyguard/KeyguardListenModel.kt
View File

@@ -58,7 +58,6 @@ data class KeyguardFaceListenModel(
val keyguardAwake: Boolean, val keyguardAwake: Boolean,
val keyguardGoingAway: Boolean, val keyguardGoingAway: Boolean,
val listeningForFaceAssistant: Boolean, val listeningForFaceAssistant: Boolean,
val lockIconPressed: Boolean,
val occludingAppRequestingFaceAuth: Boolean, val occludingAppRequestingFaceAuth: Boolean,
val primaryUser: Boolean, val primaryUser: Boolean,
val scanningAllowedByStrongAuth: Boolean, val scanningAllowedByStrongAuth: Boolean,

29
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -250,7 +250,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
private final Context mContext; private final Context mContext;
private final boolean mIsPrimaryUser; private final boolean mIsPrimaryUser;
private final boolean mIsAutomotive;
private final AuthController mAuthController; private final AuthController mAuthController;
private final StatusBarStateController mStatusBarStateController; private final StatusBarStateController mStatusBarStateController;
private int mStatusBarState; private int mStatusBarState;
@@ -328,8 +327,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
private final LatencyTracker mLatencyTracker; private final LatencyTracker mLatencyTracker;
private boolean mLogoutEnabled; private boolean mLogoutEnabled;
private boolean mIsFaceEnrolled; private boolean mIsFaceEnrolled;
// If the user long pressed the lock icon, disabling face auth for the current session.
private boolean mLockIconPressed;
private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID; private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
private final Executor mBackgroundExecutor; private final Executor mBackgroundExecutor;
private SensorPrivacyManager mSensorPrivacyManager; private SensorPrivacyManager mSensorPrivacyManager;
@@ -1767,7 +1764,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
protected void handleStartedGoingToSleep(int arg1) { protected void handleStartedGoingToSleep(int arg1) {
Assert.isMainThread(); Assert.isMainThread();
mLockIconPressed = false;
clearBiometricRecognized(); clearBiometricRecognized();
for (int i = 0; i < mCallbacks.size(); i++) { for (int i = 0; i < mCallbacks.size(); i++) {
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
@@ -2116,8 +2112,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
mFaceManager.addLockoutResetCallback(mFaceLockoutResetCallback); mFaceManager.addLockoutResetCallback(mFaceLockoutResetCallback);
} }
mIsAutomotive = isAutomotive();
TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackListener); TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackListener);
mUserManager = context.getSystemService(UserManager.class); mUserManager = context.getSystemService(UserManager.class);
mIsPrimaryUser = mUserManager.isPrimaryUser(); mIsPrimaryUser = mUserManager.isPrimaryUser();
@@ -2618,7 +2612,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|| mAuthController.isUdfpsFingerDown() || mAuthController.isUdfpsFingerDown()
|| mUdfpsBouncerShowing) || mUdfpsBouncerShowing)
&& !mSwitchingUser && !faceDisabledForUser && becauseCannotSkipBouncer && !mSwitchingUser && !faceDisabledForUser && becauseCannotSkipBouncer
&& !mKeyguardGoingAway && biometricEnabledForUser && !mLockIconPressed && !mKeyguardGoingAway && biometricEnabledForUser
&& strongAuthAllowsScanning && mIsPrimaryUser && strongAuthAllowsScanning && mIsPrimaryUser
&& (!mSecureCameraLaunched || mOccludingAppRequestingFace) && (!mSecureCameraLaunched || mOccludingAppRequestingFace)
&& !faceAuthenticated && !faceAuthenticated
@@ -2641,7 +2635,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
awakeKeyguard, awakeKeyguard,
mKeyguardGoingAway, mKeyguardGoingAway,
shouldListenForFaceAssistant, shouldListenForFaceAssistant,
mLockIconPressed,
mOccludingAppRequestingFace, mOccludingAppRequestingFace,
mIsPrimaryUser, mIsPrimaryUser,
strongAuthAllowsScanning, strongAuthAllowsScanning,
@@ -2686,18 +2679,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
} }
} }
/**
* Whenever the lock icon is long pressed, disabling trust agents.
* This means that we cannot auth passively (face) until the user presses power.
*/
public void onLockIconPressed() {
mLockIconPressed = true;
final int userId = getCurrentUser();
mUserFaceAuthenticated.put(userId, null);
updateFaceListeningState(BIOMETRIC_ACTION_UPDATE);
mStrongAuthTracker.onStrongAuthRequiredChanged(userId);
}
private void startListeningForFingerprint() { private void startListeningForFingerprint() {
final int userId = getCurrentUser(); final int userId = getCurrentUser();
final boolean unlockPossible = isUnlockWithFingerprintPossible(userId); final boolean unlockPossible = isUnlockWithFingerprintPossible(userId);
@@ -3336,10 +3317,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
return false; return false;
} }
private boolean isAutomotive() {
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
}
/** /**
* Remove the given observer's callback. * Remove the given observer's callback.
* *
@@ -3812,9 +3789,5 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
pw.println(" mNeedsSlowUnlockTransition=" + mNeedsSlowUnlockTransition); pw.println(" mNeedsSlowUnlockTransition=" + mNeedsSlowUnlockTransition);
} }
mListenModels.print(pw); mListenModels.print(pw);
if (mIsAutomotive) {
pw.println(" Running on Automotive build");
}
} }
} }

1
packages/SystemUI/tests/src/com/android/keyguard/KeyguardListenQueueTest.kt
View File

@@ -92,7 +92,6 @@ private fun faceModel(user: Int) = KeyguardFaceListenModel(
keyguardAwake = false, keyguardAwake = false,
keyguardGoingAway = false, keyguardGoingAway = false,
listeningForFaceAssistant = false, listeningForFaceAssistant = false,
lockIconPressed = false,
occludingAppRequestingFaceAuth = false, occludingAppRequestingFaceAuth = false,
primaryUser = false, primaryUser = false,
scanningAllowedByStrongAuth = false, scanningAllowedByStrongAuth = false,