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

Commit e7894588 authored May 25, 2022 by Yi Jiang Committed by Automerger Merge Worker May 25, 2022

Merge "Updates face-based auto-rotate triggering conditions." into tm-qpr-dev am: 13e24ca9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18603978

Change-Id: Ie4e5139ec21400135ddbffc3cc3caeae56f85f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 58c03b68 13e24ca9

services/core/java/com/android/server/wm/DisplayRotation.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1522,8 +1522,8 @@ public class DisplayRotation {
	}		}

	@Override		@Override
	public boolean isKeyguardLocked() {		public boolean isKeyguardShowingAndNotOccluded() {
	return mService.isKeyguardLocked();		return mService.isKeyguardShowingAndNotOccluded();
	}		}

	@Override		@Override

services/core/java/com/android/server/wm/WindowOrientationListener.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -296,9 +296,9 @@ public abstract class WindowOrientationListener {

	/**		/**
	* Whether the device is in the lock screen.		* Whether the device is in the lock screen.
	* @return returns true if the screen is locked. Otherwise, returns false.		* @return returns true if the key guard is showing on the lock screen.
	*/		*/
	public abstract boolean isKeyguardLocked();		public abstract boolean isKeyguardShowingAndNotOccluded();

	public void dumpDebug(ProtoOutputStream proto, long fieldId) {		public void dumpDebug(ProtoOutputStream proto, long fieldId) {
	final long token = proto.start(fieldId);		final long token = proto.start(fieldId);
	@@ -1151,7 +1151,7 @@ public abstract class WindowOrientationListener {
	FrameworkStatsLog.DEVICE_ROTATED__ROTATION_EVENT_TYPE__ACTUAL_EVENT);		FrameworkStatsLog.DEVICE_ROTATED__ROTATION_EVENT_TYPE__ACTUAL_EVENT);

	if (isRotationResolverEnabled()) {		if (isRotationResolverEnabled()) {
	if (isKeyguardLocked()) {		if (isKeyguardShowingAndNotOccluded()) {
	if (mLastRotationResolution != ROTATION_UNSET		if (mLastRotationResolution != ROTATION_UNSET
	&& SystemClock.uptimeMillis() - mLastRotationResolutionTimeStamp		&& SystemClock.uptimeMillis() - mLastRotationResolutionTimeStamp
	< mRotationMemorizationTimeoutMillis) {		< mRotationMemorizationTimeoutMillis) {

services/tests/servicestests/src/com/android/server/wm/WindowOrientationListenerTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -185,7 +185,7 @@ public class WindowOrientationListenerTest {
	}		}

	@Override		@Override
	public boolean isKeyguardLocked() {		public boolean isKeyguardShowingAndNotOccluded() {
	return mIsScreenLocked;		return mIsScreenLocked;
	}		}