Merge "Remove SET_FORCE_HIDING_CHANGED related logics." (429e1477) · Commits · e / os / android_frameworks_base

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

+0 −18

Original line number	Original line	Diff line number	Diff line
	@@ -48,7 +48,6 @@ import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_PLACING_SU
	import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_WILL_PLACE_SURFACES;		import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_WILL_PLACE_SURFACES;
	import static com.android.server.wm.WindowManagerService.WINDOWS_FREEZING_SCREENS_NONE;		import static com.android.server.wm.WindowManagerService.WINDOWS_FREEZING_SCREENS_NONE;
	import static com.android.server.wm.WindowManagerService.logSurface;		import static com.android.server.wm.WindowManagerService.logSurface;
	import static com.android.server.wm.WindowSurfacePlacer.SET_FORCE_HIDING_CHANGED;
	import static com.android.server.wm.WindowSurfacePlacer.SET_ORIENTATION_CHANGE_COMPLETE;		import static com.android.server.wm.WindowSurfacePlacer.SET_ORIENTATION_CHANGE_COMPLETE;
	import static com.android.server.wm.WindowSurfacePlacer.SET_UPDATE_ROTATION;		import static com.android.server.wm.WindowSurfacePlacer.SET_UPDATE_ROTATION;
	import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_ACTION_PENDING;		import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_ACTION_PENDING;
	@@ -91,7 +90,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> {
	private static final int SET_SCREEN_BRIGHTNESS_OVERRIDE = 1;		private static final int SET_SCREEN_BRIGHTNESS_OVERRIDE = 1;
	private static final int SET_USER_ACTIVITY_TIMEOUT = 2;		private static final int SET_USER_ACTIVITY_TIMEOUT = 2;

	private boolean mWallpaperForceHidingChanged = false;
	private Object mLastWindowFreezeSource = null;		private Object mLastWindowFreezeSource = null;
	private Session mHoldScreen = null;		private Session mHoldScreen = null;
	private float mScreenBrightness = -1;		private float mScreenBrightness = -1;
	@@ -626,18 +624,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> {
	recentsAnimationController.checkAnimationReady(mWallpaperController);		recentsAnimationController.checkAnimationReady(mWallpaperController);
	}		}

	if (mWallpaperForceHidingChanged && defaultDisplay.pendingLayoutChanges == 0
	&& !mService.mAppTransition.isReady()) {
	// At this point, there was a window with a wallpaper that was force hiding other
	// windows behind it, but now it is going away. This may be simple -- just animate away
	// the wallpaper and its window -- or it may be hard -- the wallpaper now needs to be
	// shown behind something that was hidden.
	defaultDisplay.pendingLayoutChanges \|= FINISH_LAYOUT_REDO_LAYOUT;
	if (DEBUG_LAYOUT_REPEATS) surfacePlacer.debugLayoutRepeats(
	"after animateAwayWallpaperLocked", defaultDisplay.pendingLayoutChanges);
	}
	mWallpaperForceHidingChanged = false;

	if (mWallpaperMayChange) {		if (mWallpaperMayChange) {
	if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "Wallpaper may change! Adjusting");		if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "Wallpaper may change! Adjusting");
	defaultDisplay.pendingLayoutChanges \|= FINISH_LAYOUT_REDO_WALLPAPER;		defaultDisplay.pendingLayoutChanges \|= FINISH_LAYOUT_REDO_WALLPAPER;
	@@ -961,10 +947,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> {
	mWallpaperMayChange = true;		mWallpaperMayChange = true;
	doRequest = true;		doRequest = true;
	}		}
	if ((bulkUpdateParams & SET_FORCE_HIDING_CHANGED) != 0) {
	mWallpaperForceHidingChanged = true;
	doRequest = true;
	}
	if ((bulkUpdateParams & SET_ORIENTATION_CHANGE_COMPLETE) == 0) {		if ((bulkUpdateParams & SET_ORIENTATION_CHANGE_COMPLETE) == 0) {
	mOrientationChangeComplete = false;		mOrientationChangeComplete = false;
	} else {		} else {

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

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -284,9 +284,6 @@ public class WindowAnimator {
	if ((bulkUpdateParams & WindowSurfacePlacer.SET_WALLPAPER_MAY_CHANGE) != 0) {		if ((bulkUpdateParams & WindowSurfacePlacer.SET_WALLPAPER_MAY_CHANGE) != 0) {
	builder.append(" WALLPAPER_MAY_CHANGE");		builder.append(" WALLPAPER_MAY_CHANGE");
	}		}
	if ((bulkUpdateParams & WindowSurfacePlacer.SET_FORCE_HIDING_CHANGED) != 0) {
	builder.append(" FORCE_HIDING_CHANGED");
	}
	if ((bulkUpdateParams & WindowSurfacePlacer.SET_ORIENTATION_CHANGE_COMPLETE) != 0) {		if ((bulkUpdateParams & WindowSurfacePlacer.SET_ORIENTATION_CHANGE_COMPLETE) != 0) {
	builder.append(" ORIENTATION_CHANGE_COMPLETE");		builder.append(" ORIENTATION_CHANGE_COMPLETE");
	}		}

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

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -92,9 +92,8 @@ class WindowSurfacePlacer {

	static final int SET_UPDATE_ROTATION = 1 << 0;		static final int SET_UPDATE_ROTATION = 1 << 0;
	static final int SET_WALLPAPER_MAY_CHANGE = 1 << 1;		static final int SET_WALLPAPER_MAY_CHANGE = 1 << 1;
	static final int SET_FORCE_HIDING_CHANGED = 1 << 2;		static final int SET_ORIENTATION_CHANGE_COMPLETE = 1 << 2;
	static final int SET_ORIENTATION_CHANGE_COMPLETE = 1 << 3;		static final int SET_WALLPAPER_ACTION_PENDING = 1 << 3;
	static final int SET_WALLPAPER_ACTION_PENDING = 1 << 4;

	private boolean mTraversalScheduled;		private boolean mTraversalScheduled;
	private int mDeferDepth = 0;		private int mDeferDepth = 0;