Merge "Merge "Ensure we leave the orientation changing state." into oc-dr1-dev... (24421e77) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2681,7 +2681,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		if (!w.getOrientationChanging()) {
		return;
		}
		w.setOrientationChanging(false);
		w.orientationChangeTimedOut();
		w.mLastFreezeDuration = (int)(SystemClock.elapsedRealtime()
		- mService.mDisplayFreezeTime);
		Slog.w(TAG_WM, "Force clearing orientation change: " + w);

+18 −1

Original line number	Diff line number	Diff line
		@@ -448,6 +448,17 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		*/
		private boolean mOrientationChanging;

		/**
		* Sometimes in addition to the mOrientationChanging
		* flag we report that the orientation is changing
		* due to a mismatch in current and reported configuration.
		*
		* In the case of timeout we still need to make sure we
		* leave the orientation changing state though, so we
		* use this as a special time out escape hatch.
		*/
		private boolean mOrientationChangeTimedOut;

		/**
		* The orientation during the last visible call to relayout. If our
		* current orientation is different, the window can't be ready
		@@ -1226,11 +1237,17 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		// better indicator consistent with the client.
		return (mOrientationChanging \|\| (isVisible()
		&& getConfiguration().orientation != mLastReportedConfiguration.orientation))
		&& !mSeamlesslyRotated;
		&& !mSeamlesslyRotated
		&& !mOrientationChangeTimedOut;
		}

		void setOrientationChanging(boolean changing) {
		mOrientationChanging = changing;
		mOrientationChangeTimedOut = false;
		}

		void orientationChangeTimedOut() {
		mOrientationChangeTimedOut = true;
		}

		DisplayContent getDisplayContent() {