Merge "Don't wakeup from the pickup gesture when kg is occluded" into sc-qpr1-dev (04c515b8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+7 −10

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import android.hardware.fingerprint.IUdfpsOverlayController;
		import android.hardware.fingerprint.IUdfpsOverlayControllerCallback;
		import android.media.AudioAttributes;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.PowerManager;
		import android.os.Process;
		import android.os.RemoteException;
		@@ -63,7 +62,6 @@ import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.doze.DozeReceiver;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.keyguard.KeyguardViewMediator;
		import com.android.systemui.keyguard.ScreenLifecycle;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		@@ -71,6 +69,7 @@ import com.android.systemui.statusbar.LockscreenShadeTransitionController;
		import com.android.systemui.statusbar.phone.KeyguardBypassController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.util.concurrency.DelayableExecutor;
		@@ -117,9 +116,7 @@ public class UdfpsController implements DozeReceiver {
		@NonNull private final StatusBarKeyguardViewManager mKeyguardViewManager;
		@NonNull private final DumpManager mDumpManager;
		@NonNull private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
		@NonNull private final KeyguardViewMediator mKeyguardViewMediator;
		@Nullable private final Vibrator mVibrator;
		@NonNull private final Handler mMainHandler;
		@NonNull private final FalsingManager mFalsingManager;
		@NonNull private final PowerManager mPowerManager;
		@NonNull private final AccessibilityManager mAccessibilityManager;
		@@ -128,6 +125,8 @@ public class UdfpsController implements DozeReceiver {
		@NonNull private final KeyguardBypassController mKeyguardBypassController;
		@NonNull private final ConfigurationController mConfigurationController;
		@NonNull private final SystemClock mSystemClock;
		@NonNull private final UnlockedScreenOffAnimationController
		mUnlockedScreenOffAnimationController;
		@VisibleForTesting @NonNull final BiometricOrientationEventListener mOrientationListener;
		// Currently the UdfpsController supports a single UDFPS sensor. If devices have multiple
		// sensors, this, in addition to a lot of the code here, will be updated.
		@@ -517,7 +516,6 @@ public class UdfpsController implements DozeReceiver {
		@NonNull StatusBarKeyguardViewManager statusBarKeyguardViewManager,
		@NonNull DumpManager dumpManager,
		@NonNull KeyguardUpdateMonitor keyguardUpdateMonitor,
		@NonNull KeyguardViewMediator keyguardViewMediator,
		@NonNull FalsingManager falsingManager,
		@NonNull PowerManager powerManager,
		@NonNull AccessibilityManager accessibilityManager,
		@@ -531,11 +529,11 @@ public class UdfpsController implements DozeReceiver {
		@NonNull DisplayManager displayManager,
		@Main Handler mainHandler,
		@NonNull ConfigurationController configurationController,
		@NonNull SystemClock systemClock) {
		@NonNull SystemClock systemClock,
		@NonNull UnlockedScreenOffAnimationController unlockedScreenOffAnimationController) {
		mContext = context;
		mExecution = execution;
		// TODO (b/185124905): inject main handler and vibrator once done prototyping
		mMainHandler = new Handler(Looper.getMainLooper());
		mVibrator = vibrator;
		mInflater = inflater;
		// The fingerprint manager is queried for UDFPS before this class is constructed, so the
		@@ -549,7 +547,6 @@ public class UdfpsController implements DozeReceiver {
		mKeyguardViewManager = statusBarKeyguardViewManager;
		mDumpManager = dumpManager;
		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
		mKeyguardViewMediator = keyguardViewMediator;
		mFalsingManager = falsingManager;
		mPowerManager = powerManager;
		mAccessibilityManager = accessibilityManager;
		@@ -568,6 +565,7 @@ public class UdfpsController implements DozeReceiver {
		mKeyguardBypassController = keyguardBypassController;
		mConfigurationController = configurationController;
		mSystemClock = systemClock;
		mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;

		mSensorProps = findFirstUdfps();
		// At least one UDFPS sensor exists
		@@ -790,13 +788,12 @@ public class UdfpsController implements DozeReceiver {
		mStatusBar,
		mKeyguardViewManager,
		mKeyguardUpdateMonitor,
		mFgExecutor,
		mDumpManager,
		mKeyguardViewMediator,
		mLockscreenShadeTransitionController,
		mConfigurationController,
		mSystemClock,
		mKeyguardStateController,
		mUnlockedScreenOffAnimationController,
		this
		);
		case IUdfpsOverlayController.REASON_AUTH_BP:

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -26,16 +26,15 @@ import android.view.MotionEvent;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.systemui.R;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.keyguard.KeyguardViewMediator;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.LockscreenShadeTransitionController;
		import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.phone.KeyguardBouncer;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.util.concurrency.DelayableExecutor;
		import com.android.systemui.util.time.SystemClock;

		import java.io.FileDescriptor;
		@@ -48,13 +47,13 @@ import java.io.PrintWriter;
		public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<UdfpsKeyguardView> {
		@NonNull private final StatusBarKeyguardViewManager mKeyguardViewManager;
		@NonNull private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
		@NonNull private final DelayableExecutor mExecutor;
		@NonNull private final KeyguardViewMediator mKeyguardViewMediator;
		@NonNull private final LockscreenShadeTransitionController mLockScreenShadeTransitionController;
		@NonNull private final ConfigurationController mConfigurationController;
		@NonNull private final SystemClock mSystemClock;
		@NonNull private final KeyguardStateController mKeyguardStateController;
		@NonNull private final UdfpsController mUdfpsController;
		@NonNull private final UnlockedScreenOffAnimationController
		mUnlockedScreenOffAnimationController;

		private boolean mShowingUdfpsBouncer;
		private boolean mUdfpsRequested;
		@@ -81,24 +80,22 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		@NonNull StatusBar statusBar,
		@NonNull StatusBarKeyguardViewManager statusBarKeyguardViewManager,
		@NonNull KeyguardUpdateMonitor keyguardUpdateMonitor,
		@NonNull DelayableExecutor mainDelayableExecutor,
		@NonNull DumpManager dumpManager,
		@NonNull KeyguardViewMediator keyguardViewMediator,
		@NonNull LockscreenShadeTransitionController transitionController,
		@NonNull ConfigurationController configurationController,
		@NonNull SystemClock systemClock,
		@NonNull KeyguardStateController keyguardStateController,
		@NonNull UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,
		@NonNull UdfpsController udfpsController) {
		super(view, statusBarStateController, statusBar, dumpManager);
		mKeyguardViewManager = statusBarKeyguardViewManager;
		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
		mExecutor = mainDelayableExecutor;
		mKeyguardViewMediator = keyguardViewMediator;
		mLockScreenShadeTransitionController = transitionController;
		mConfigurationController = configurationController;
		mSystemClock = systemClock;
		mKeyguardStateController = keyguardStateController;
		mUdfpsController = udfpsController;
		mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;
		}

		@Override
		@@ -135,6 +132,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud

		mKeyguardViewManager.setAlternateAuthInterceptor(mAlternateAuthInterceptor);
		mLockScreenShadeTransitionController.setUdfpsKeyguardViewController(this);
		mUnlockedScreenOffAnimationController.addCallback(mUnlockedScreenOffCallback);
		}

		@Override
		@@ -151,6 +149,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		if (mLockScreenShadeTransitionController.getUdfpsKeyguardViewController() == this) {
		mLockScreenShadeTransitionController.setUdfpsKeyguardViewController(null);
		}
		mUnlockedScreenOffAnimationController.removeCallback(mUnlockedScreenOffCallback);
		}

		@Override
		@@ -423,4 +422,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		updatePauseAuth();
		}
		};

		private final UnlockedScreenOffAnimationController.Callback mUnlockedScreenOffCallback =
		(linear, eased) -> mStateListener.onDozeAmountChanged(linear, eased);
		}

packages/SystemUI/src/com/android/systemui/doze/DozeLog.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -274,6 +274,13 @@ public class DozeLog implements Dumpable {
		mLogger.logPulseDropped(pulsePending, state, blocked);
		}

		/**
		* Appends sensor event dropped event to logs
		*/
		public void traceSensorEventDropped(int sensorEvent, String reason) {
		mLogger.logSensorEventDropped(sensorEvent, reason);
		}

		/**
		* Appends pulse dropped event to logs
		* @param reason why the pulse was dropped

packages/SystemUI/src/com/android/systemui/doze/DozeLogger.kt

+9 −0

Original line number	Diff line number	Diff line
		@@ -205,6 +205,15 @@ class DozeLogger @Inject constructor(
		})
		}

		fun logSensorEventDropped(sensorEvent: Int, reason: String) {
		buffer.log(TAG, INFO, {
		int1 = sensorEvent
		str1 = reason
		}, {
		"SensorEvent [$int1] dropped, reason=$str1"
		})
		}

		fun logPulseDropped(reason: String) {
		buffer.log(TAG, INFO, {
		str1 = reason

packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import com.android.systemui.dock.DockManager;
		import com.android.systemui.doze.DozeMachine.State;
		import com.android.systemui.doze.dagger.DozeScope;
		import com.android.systemui.statusbar.phone.DozeParameters;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.util.Assert;
		import com.android.systemui.util.concurrency.DelayableExecutor;
		import com.android.systemui.util.sensors.AsyncSensorManager;
		@@ -92,6 +93,7 @@ public class DozeTriggers implements DozeMachine.Part {
		private final BroadcastDispatcher mBroadcastDispatcher;
		private final AuthController mAuthController;
		private final DelayableExecutor mMainExecutor;
		private final KeyguardStateController mKeyguardStateController;
		private final UiEventLogger mUiEventLogger;

		private long mNotificationPulseTime;
		@@ -179,7 +181,8 @@ public class DozeTriggers implements DozeMachine.Part {
		DozeLog dozeLog, BroadcastDispatcher broadcastDispatcher,
		SecureSettings secureSettings, AuthController authController,
		@Main DelayableExecutor mainExecutor,
		UiEventLogger uiEventLogger) {
		UiEventLogger uiEventLogger,
		KeyguardStateController keyguardStateController) {
		mContext = context;
		mDozeHost = dozeHost;
		mConfig = config;
		@@ -198,6 +201,7 @@ public class DozeTriggers implements DozeMachine.Part {
		mAuthController = authController;
		mMainExecutor = mainExecutor;
		mUiEventLogger = uiEventLogger;
		mKeyguardStateController = keyguardStateController;
		}

		@Override
		@@ -294,6 +298,7 @@ public class DozeTriggers implements DozeMachine.Part {
		proximityCheckThenCall((result) -> {
		if (result != null && result) {
		// In pocket, drop event.
		mDozeLog.traceSensorEventDropped(pulseReason, "prox reporting near");
		return;
		}
		if (isDoubleTap \|\| isTap) {
		@@ -302,6 +307,10 @@ public class DozeTriggers implements DozeMachine.Part {
		}
		gentleWakeUp(pulseReason);
		} else if (isPickup) {
		if (shouldDropPickupEvent()) {
		mDozeLog.traceSensorEventDropped(pulseReason, "keyguard occluded");
		return;
		}
		gentleWakeUp(pulseReason);
		} else if (isUdfpsLongPress) {
		final State state = mMachine.getState();
		@@ -320,7 +329,7 @@ public class DozeTriggers implements DozeMachine.Part {
		}, true /* alreadyPerformedProxCheck */, pulseReason);
		}

		if (isPickup) {
		if (isPickup && !shouldDropPickupEvent()) {
		final long timeSinceNotification =
		SystemClock.elapsedRealtime() - mNotificationPulseTime;
		final boolean withinVibrationThreshold =
		@@ -329,6 +338,10 @@ public class DozeTriggers implements DozeMachine.Part {
		}
		}

		private boolean shouldDropPickupEvent() {
		return mKeyguardStateController.isOccluded();
		}

		private void gentleWakeUp(int reason) {
		// Log screen wake up reason (lift/pickup, tap, double-tap)
		Optional.ofNullable(DozingUpdateUiEvent.fromReason(reason))