Merge "Updates face-based auto-rotate triggering conditions." (308963e0) · Commits · e / os / android_frameworks_base

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

+2 −2

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

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

		@Override

+3 −3

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

		/**
		* 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) {
		final long token = proto.start(fieldId);
		@@ -1151,7 +1151,7 @@ public abstract class WindowOrientationListener {
		FrameworkStatsLog.DEVICE_ROTATED__ROTATION_EVENT_TYPE__ACTUAL_EVENT);

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

+1 −1

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

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