Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into oc-dr1-dev (4e5c3fbd) · Commits · e / os / android_frameworks_base

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

+26 −19

Original line number	Diff line number	Diff line
		@@ -1604,7 +1604,8 @@ class WindowStateAnimator {
		recoveringMemory);
		mSurfaceController.setLayer(mAnimLayer);

		if (prepared && mLastHidden && mDrawState == HAS_DRAWN) {
		if (prepared && mDrawState == HAS_DRAWN) {
		if (mLastHidden) {
		if (showSurfaceRobustlyLocked()) {
		markPreservedSurfaceForDestroy();
		mAnimator.requestRemovalOfReplacedWindows(w);
		@@ -1621,6 +1622,17 @@ class WindowStateAnimator {
		w.setOrientationChanging(false);
		}
		}
		// We process mTurnOnScreen even for windows which have already
		// been shown, to handle cases where windows are not necessarily
		// hidden while the screen is turning off.
		// TODO(b/63773439): These cases should be eliminated, though we probably still
		// want to process mTurnOnScreen in this way for clarity.
		if (mWin.mTurnOnScreen) {
		if (DEBUG_VISIBILITY) Slog.v(TAG, "Show surface turning screen on: " + mWin);
		mWin.mTurnOnScreen = false;
		mAnimator.mBulkUpdateParams \|= SET_TURN_ON_SCREEN;
		}
		}
		if (hasSurface()) {
		w.mToken.hasVisible = true;
		}
		@@ -1730,11 +1742,6 @@ class WindowStateAnimator {
		if (!shown)
		return false;

		if (mWin.mTurnOnScreen) {
		if (DEBUG_VISIBILITY) Slog.v(TAG, "Show surface turning screen on: " + mWin);
		mWin.mTurnOnScreen = false;
		mAnimator.mBulkUpdateParams \|= SET_TURN_ON_SCREEN;
		}
		return true;
		}