Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 583f935a authored Jun 28, 2023 by /e/ robot

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 2dd1b092 86758596

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -3571,13 +3571,15 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
		// Delay if we're waking up, not mid-doze animation (which means we are
		// cancelling a sleep), from the power button, on a device with a power button
		// FPS, and 'press to unlock' is required.
		FingerprintManager fpm = mFingerprintManager.get();
		mShouldDelayWakeUpAnimation =
		!isPulsing()
		&& mStatusBarStateController.getDozeAmount() == 1f
		&& mWakefulnessLifecycle.getLastWakeReason()
		== PowerManager.WAKE_REASON_POWER_BUTTON
		&& mFingerprintManager.get().isPowerbuttonFps()
		&& mFingerprintManager.get().hasEnrolledFingerprints()
		&& fpm != null
		&& fpm.isPowerbuttonFps()
		&& fpm.hasEnrolledFingerprints()
		&& !touchToUnlockAnytime;
		if (DEBUG_WAKEUP_DELAY) {
		Log.d(TAG, "mShouldDelayWakeUpAnimation=" + mShouldDelayWakeUpAnimation);

services/core/java/com/android/server/policy/SideFpsEventHandler.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,10 @@ public class SideFpsEventHandler implements View.OnClickListener {
		*/
		public void notifyPowerPressed() {
		Log.i(TAG, "notifyPowerPressed");
		final PackageManager pm = mContext.getPackageManager();
		if (!pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
		return;
		}
		if (mFingerprintManager == null) {
		mFingerprintManager = mContext.getSystemService(FingerprintManager.class);
		}