From 95270beb3230c9aceabbcee3916115606b1e21ad Mon Sep 17 00:00:00 2001 From: Joshua McCloskey Date: Mon, 23 Jan 2023 22:46:06 +0000 Subject: Removed fp acquire start wakes up device. Test: Manually verified fingerprint tap from screen off no longer wakes up device. Bug: 246774240 Change-Id: I2ccf76d4e34802af3cb6382b5d030751a65a20a9 --- core/res/res/values/bools.xml | 1 - core/res/res/values/symbols.xml | 1 - .../android/keyguard/KeyguardUpdateMonitor.java | 13 --------- .../keyguard/KeyguardUpdateMonitorTest.java | 34 +--------------------- 4 files changed, 1 insertion(+), 48 deletions(-) diff --git a/core/res/res/values/bools.xml b/core/res/res/values/bools.xml index 4b27bf2849fb..fe296c704095 100644 --- a/core/res/res/values/bools.xml +++ b/core/res/res/values/bools.xml @@ -18,7 +18,6 @@ true false true - false true true false diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 2715c94c555a..037f38b2e175 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2773,7 +2773,6 @@ - diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 9d6bb087288b..31969fb74c8f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -26,7 +26,6 @@ import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_LOCKOUT_N import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_LOCKOUT_PERMANENT; import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_LOCKOUT_TIMED; import static android.hardware.biometrics.BiometricConstants.LockoutMode; -import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_START; import static android.hardware.biometrics.BiometricSourceType.FACE; import static android.hardware.biometrics.BiometricSourceType.FINGERPRINT; import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN; @@ -353,7 +352,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private final Executor mBackgroundExecutor; private final SensorPrivacyManager mSensorPrivacyManager; private final ActiveUnlockConfig mActiveUnlockConfig; - private final PowerManager mPowerManager; private final IDreamManager mDreamManager; private final TelephonyManager mTelephonyManager; @Nullable @@ -361,7 +359,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab @Nullable private final FaceManager mFaceManager; private final LockPatternUtils mLockPatternUtils; - private final boolean mWakeOnFingerprintAcquiredStart; @VisibleForTesting @DevicePostureController.DevicePostureInt protected int mConfigFaceAuthSupportedPosture; @@ -885,11 +882,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private void handleFingerprintAcquired( @BiometricFingerprintConstants.FingerprintAcquired int acquireInfo) { Assert.isMainThread(); - if (mWakeOnFingerprintAcquiredStart && acquireInfo == FINGERPRINT_ACQUIRED_START) { - mPowerManager.wakeUp( - SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_BIOMETRIC, - "com.android.systemui.keyguard:FINGERPRINT_ACQUIRED_START"); - } for (int i = 0; i < mCallbacks.size(); i++) { KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); if (cb != null) { @@ -2050,7 +2042,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab UiEventLogger uiEventLogger, // This has to be a provider because SessionTracker depends on KeyguardUpdateMonitor :( Provider sessionTrackerProvider, - PowerManager powerManager, TrustManager trustManager, SubscriptionManager subscriptionManager, UserManager userManager, @@ -2087,7 +2078,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab mLogger = logger; mUiEventLogger = uiEventLogger; mSessionTrackerProvider = sessionTrackerProvider; - mPowerManager = powerManager; mTrustManager = trustManager; mUserManager = userManager; mDreamManager = dreamManager; @@ -2098,8 +2088,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab mFpm = fingerprintManager; mFaceManager = faceManager; mActiveUnlockConfig.setKeyguardUpdateMonitor(this); - mWakeOnFingerprintAcquiredStart = context.getResources() - .getBoolean(com.android.internal.R.bool.kg_wake_on_acquire_start); mFaceAcquiredInfoIgnoreList = Arrays.stream( mContext.getResources().getIntArray( R.array.config_face_acquire_device_entry_ignorelist)) @@ -3879,7 +3867,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab pw.println(" getUserHasTrust()=" + getUserHasTrust(getCurrentUser())); pw.println(" getUserUnlockedWithBiometric()=" + getUserUnlockedWithBiometric(getCurrentUser())); - pw.println(" mWakeOnFingerprintAcquiredStart=" + mWakeOnFingerprintAcquiredStart); pw.println(" SIM States:"); for (SimData data : mSimDatas.values()) { pw.println(" " + data.toString()); diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index 87dd6a4cfa5e..a7a210c9957b 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -18,7 +18,6 @@ package com.android.keyguard; import static android.app.StatusBarManager.SESSION_KEYGUARD; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT; -import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_START; import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ERROR_LOCKOUT; import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ERROR_LOCKOUT_PERMANENT; import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON; @@ -42,7 +41,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -96,7 +94,6 @@ import android.os.PowerManager; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import android.provider.Settings; import android.service.dreams.IDreamManager; import android.service.trust.TrustAgentService; import android.telephony.ServiceState; @@ -239,8 +236,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { @Mock private UiEventLogger mUiEventLogger; @Mock - private PowerManager mPowerManager; - @Mock private GlobalSettings mGlobalSettings; private FaceWakeUpTriggersConfig mFaceWakeUpTriggersConfig; @Mock @@ -1871,28 +1866,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { assertThat(mKeyguardUpdateMonitor.shouldListenForFingerprint(true)).isEqualTo(true); } - @Test - public void testFingerAcquired_wakesUpPowerManager() { - cleanupKeyguardUpdateMonitor(); - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.bool.kg_wake_on_acquire_start, true); - mKeyguardUpdateMonitor = new TestableKeyguardUpdateMonitor(mContext); - fingerprintAcquireStart(); - - verify(mPowerManager).wakeUp(anyLong(), anyInt(), anyString()); - } - - @Test - public void testFingerAcquired_doesNotWakeUpPowerManager() { - cleanupKeyguardUpdateMonitor(); - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.bool.kg_wake_on_acquire_start, false); - mKeyguardUpdateMonitor = new TestableKeyguardUpdateMonitor(mContext); - fingerprintAcquireStart(); - - verify(mPowerManager, never()).wakeUp(anyLong(), anyInt(), anyString()); - } - @Test public void testDreamingStopped_faceDoesNotRun() { mKeyguardUpdateMonitor.dispatchDreamingStopped(); @@ -2374,11 +2347,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { .onAuthenticationError(FINGERPRINT_ERROR_LOCKOUT, "Fingerprint locked out"); } - private void fingerprintAcquireStart() { - mKeyguardUpdateMonitor.mFingerprintAuthenticationCallback - .onAuthenticationAcquired(FINGERPRINT_ACQUIRED_START); - } - private void deviceInPostureStateOpened() { mKeyguardUpdateMonitor.mPostureCallback.onPostureChanged(DEVICE_POSTURE_OPENED); } @@ -2525,7 +2493,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mAuthController, mTelephonyListenerManager, mInteractionJankMonitor, mLatencyTracker, mActiveUnlockConfig, mKeyguardUpdateMonitorLogger, mUiEventLogger, () -> mSessionTracker, - mPowerManager, mTrustManager, mSubscriptionManager, mUserManager, + mTrustManager, mSubscriptionManager, mUserManager, mDreamManager, mDevicePolicyManager, mSensorPrivacyManager, mTelephonyManager, mPackageManager, mFaceManager, mFingerprintManager, mBiometricManager, mFaceWakeUpTriggersConfig, mDevicePostureController, -- cgit v1.2.3-59-g8ed1b