Merge "Rename mCameraGestureTriggered to mPowerButtonLaunchGestureTriggered." into main (f0f65221) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/IKeyguardService.aidl

+7 −7

Original line number	Diff line number	Diff line
		@@ -53,21 +53,21 @@ oneway interface IKeyguardService {
		*
		* @param pmSleepReason One of PowerManager.GO_TO_SLEEP_REASON_*, detailing the specific reason
		* we're going to sleep, such as GO_TO_SLEEP_REASON_POWER_BUTTON or GO_TO_SLEEP_REASON_TIMEOUT.
		* @param cameraGestureTriggered whether the camera gesture was triggered between
		* {@link #onStartedGoingToSleep} and this method; if it's been
		* triggered, we shouldn't lock the device.
		* @param powerButtonLaunchGestureTriggered whether the power button double tap gesture was
		* triggered between {@link #onStartedGoingToSleep} and this
		* method; if it's been triggered, we shouldn't lock the device.
		*/
		void onFinishedGoingToSleep(int pmSleepReason, boolean cameraGestureTriggered);
		void onFinishedGoingToSleep(int pmSleepReason, boolean powerButtonLaunchGestureTriggered);

		/**
		* Called when the device has started waking up.

		* @param pmWakeReason One of PowerManager.WAKE_REASON_*, detailing the reason we're waking up,
		* such as WAKE_REASON_POWER_BUTTON or WAKE_REASON_GESTURE.
		* @param cameraGestureTriggered Whether we're waking up due to a power button double tap
		* gesture.
		* @param powerButtonLaunchGestureTriggered Whether we're waking up due to a power button
		* double tap gesture.
		*/
		void onStartedWakingUp(int pmWakeReason, boolean cameraGestureTriggered);
		void onStartedWakingUp(int pmWakeReason, boolean powerButtonLaunchGestureTriggered);

		/**
		* Called when the device has finished waking up.

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -538,27 +538,30 @@ public class KeyguardService extends Service {

		@Override // Binder interface
		public void onFinishedGoingToSleep(
		@PowerManager.GoToSleepReason int pmSleepReason, boolean cameraGestureTriggered) {
		@PowerManager.GoToSleepReason int pmSleepReason, boolean
		powerButtonLaunchGestureTriggered) {
		trace("onFinishedGoingToSleep pmSleepReason=" + pmSleepReason
		+ " cameraGestureTriggered=" + cameraGestureTriggered);
		+ " powerButtonLaunchTriggered=" + powerButtonLaunchGestureTriggered);
		checkPermission();
		mKeyguardViewMediator.onFinishedGoingToSleep(
		WindowManagerPolicyConstants.translateSleepReasonToOffReason(pmSleepReason),
		cameraGestureTriggered);
		mPowerInteractor.onFinishedGoingToSleep(cameraGestureTriggered);
		powerButtonLaunchGestureTriggered);
		mPowerInteractor.onFinishedGoingToSleep(powerButtonLaunchGestureTriggered);
		mKeyguardLifecyclesDispatcher.dispatch(
		KeyguardLifecyclesDispatcher.FINISHED_GOING_TO_SLEEP);
		}

		@Override // Binder interface
		public void onStartedWakingUp(
		@PowerManager.WakeReason int pmWakeReason, boolean cameraGestureTriggered) {
		@PowerManager.WakeReason int pmWakeReason,
		boolean powerButtonLaunchGestureTriggered) {
		trace("onStartedWakingUp pmWakeReason=" + pmWakeReason
		+ " cameraGestureTriggered=" + cameraGestureTriggered);
		+ " powerButtonLaunchGestureTriggered=" + powerButtonLaunchGestureTriggered);
		Trace.beginSection("KeyguardService.mBinder#onStartedWakingUp");
		checkPermission();
		mKeyguardViewMediator.onStartedWakingUp(pmWakeReason, cameraGestureTriggered);
		mPowerInteractor.onStartedWakingUp(pmWakeReason, cameraGestureTriggered);
		mKeyguardViewMediator.onStartedWakingUp(pmWakeReason,
		powerButtonLaunchGestureTriggered);
		mPowerInteractor.onStartedWakingUp(pmWakeReason, powerButtonLaunchGestureTriggered);
		mKeyguardLifecyclesDispatcher.dispatch(
		KeyguardLifecyclesDispatcher.STARTED_WAKING_UP, pmWakeReason);
		Trace.endSection();

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -562,8 +562,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		volatile boolean mPowerKeyHandled;
		volatile boolean mBackKeyHandled;
		volatile boolean mEndCallKeyHandled;
		volatile boolean mCameraGestureTriggered;
		volatile boolean mCameraGestureTriggeredDuringGoingToSleep;
		volatile boolean mPowerButtonLaunchGestureTriggered;
		volatile boolean mPowerButtonLaunchGestureTriggeredDuringGoingToSleep;

		/**
		* {@code true} if the device is entering a low-power state; {@code false otherwise}.
		@@ -5893,7 +5893,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (mGestureLauncherService == null) {
		return false;
		}
		mCameraGestureTriggered = false;
		mPowerButtonLaunchGestureTriggered = false;
		final MutableBoolean outLaunched = new MutableBoolean(false);
		final boolean intercept =
		mGestureLauncherService.interceptPowerKeyDown(event, interactive, outLaunched);
		@@ -5903,9 +5903,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		// detector from processing the power key later on.
		return intercept;
		}
		mCameraGestureTriggered = true;
		mPowerButtonLaunchGestureTriggered = true;
		if (mRequestedOrSleepingDefaultDisplay) {
		mCameraGestureTriggeredDuringGoingToSleep = true;
		mPowerButtonLaunchGestureTriggeredDuringGoingToSleep = true;
		// Wake device up early to prevent display doing redundant turning off/on stuff.
		mWindowWakeUpPolicy.wakeUpFromPowerKeyCameraGesture();
		}
		@@ -6282,13 +6282,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		if (mKeyguardDelegate != null) {
		mKeyguardDelegate.onFinishedGoingToSleep(pmSleepReason,
		mCameraGestureTriggeredDuringGoingToSleep);
		mPowerButtonLaunchGestureTriggeredDuringGoingToSleep);
		}
		if (mDisplayFoldController != null) {
		mDisplayFoldController.finishedGoingToSleep();
		}
		mCameraGestureTriggeredDuringGoingToSleep = false;
		mCameraGestureTriggered = false;
		mPowerButtonLaunchGestureTriggeredDuringGoingToSleep = false;
		mPowerButtonLaunchGestureTriggered = false;
		}

		// Called on the PowerManager's Notifier thread.
		@@ -6319,10 +6319,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mDefaultDisplayRotation.updateOrientationListener();

		if (mKeyguardDelegate != null) {
		mKeyguardDelegate.onStartedWakingUp(pmWakeReason, mCameraGestureTriggered);
		mKeyguardDelegate.onStartedWakingUp(pmWakeReason, mPowerButtonLaunchGestureTriggered);
		}

		mCameraGestureTriggered = false;
		mPowerButtonLaunchGestureTriggered = false;
		}

		// Called on the PowerManager's Notifier thread.

services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -198,7 +198,7 @@ public class KeyguardServiceDelegate {
		if (mKeyguardState.interactiveState == INTERACTIVE_STATE_AWAKE
		\|\| mKeyguardState.interactiveState == INTERACTIVE_STATE_WAKING) {
		mKeyguardService.onStartedWakingUp(PowerManager.WAKE_REASON_UNKNOWN,
		false /* cameraGestureTriggered */);
		false /* powerButtonLaunchGestureTriggered */);
		}
		if (mKeyguardState.interactiveState == INTERACTIVE_STATE_AWAKE) {
		mKeyguardService.onFinishedWakingUp();
		@@ -319,10 +319,10 @@ public class KeyguardServiceDelegate {
		}

		public void onStartedWakingUp(
		@PowerManager.WakeReason int pmWakeReason, boolean cameraGestureTriggered) {
		@PowerManager.WakeReason int pmWakeReason, boolean powerButtonLaunchGestureTriggered) {
		if (mKeyguardService != null) {
		if (DEBUG) Log.v(TAG, "onStartedWakingUp()");
		mKeyguardService.onStartedWakingUp(pmWakeReason, cameraGestureTriggered);
		mKeyguardService.onStartedWakingUp(pmWakeReason, powerButtonLaunchGestureTriggered);
		}
		mKeyguardState.interactiveState = INTERACTIVE_STATE_WAKING;
		}
		@@ -383,9 +383,11 @@ public class KeyguardServiceDelegate {
		}

		public void onFinishedGoingToSleep(
		@PowerManager.GoToSleepReason int pmSleepReason, boolean cameraGestureTriggered) {
		@PowerManager.GoToSleepReason int pmSleepReason,
		boolean powerButtonLaunchGestureTriggered) {
		if (mKeyguardService != null) {
		mKeyguardService.onFinishedGoingToSleep(pmSleepReason, cameraGestureTriggered);
		mKeyguardService.onFinishedGoingToSleep(pmSleepReason,
		powerButtonLaunchGestureTriggered);
		}
		mKeyguardState.interactiveState = INTERACTIVE_STATE_SLEEP;
		}

services/core/java/com/android/server/policy/keyguard/KeyguardServiceWrapper.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -113,9 +113,10 @@ public class KeyguardServiceWrapper implements IKeyguardService {

		@Override
		public void onFinishedGoingToSleep(
		@PowerManager.GoToSleepReason int pmSleepReason, boolean cameraGestureTriggered) {
		@PowerManager.GoToSleepReason int pmSleepReason,
		boolean powerButtonLaunchGestureTriggered) {
		try {
		mService.onFinishedGoingToSleep(pmSleepReason, cameraGestureTriggered);
		mService.onFinishedGoingToSleep(pmSleepReason, powerButtonLaunchGestureTriggered);
		} catch (RemoteException e) {
		Slog.w(TAG , "Remote Exception", e);
		}
		@@ -123,9 +124,9 @@ public class KeyguardServiceWrapper implements IKeyguardService {

		@Override
		public void onStartedWakingUp(
		@PowerManager.WakeReason int pmWakeReason, boolean cameraGestureTriggered) {
		@PowerManager.WakeReason int pmWakeReason, boolean powerButtonLaunchGestureTriggered) {
		try {
		mService.onStartedWakingUp(pmWakeReason, cameraGestureTriggered);
		mService.onStartedWakingUp(pmWakeReason, powerButtonLaunchGestureTriggered);
		} catch (RemoteException e) {
		Slog.w(TAG , "Remote Exception", e);
		}