Merge "Remove unused fields of window animator" into main (9fbab841) · Commits · e / os / android_frameworks_base

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

+0 −17

Original line number	Diff line number	Diff line
		@@ -79,8 +79,6 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
		import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL;
		import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_PLACING_SURFACES;
		import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_WILL_PLACE_SURFACES;
		import static com.android.server.wm.WindowSurfacePlacer.SET_UPDATE_ROTATION;
		import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_ACTION_PENDING;

		import static java.lang.Integer.MAX_VALUE;

		@@ -655,9 +653,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		final int count = mChildren.size();
		for (int i = 0; i < count; ++i) {
		final int pendingChanges = mChildren.get(i).pendingLayoutChanges;
		if ((pendingChanges & FINISH_LAYOUT_REDO_WALLPAPER) != 0) {
		animator.mBulkUpdateParams \|= SET_WALLPAPER_ACTION_PENDING;
		}
		if (pendingChanges != 0) {
		hasChanges = true;
		}
		@@ -1024,18 +1019,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		return changed;
		}

		boolean copyAnimToLayoutParams() {
		boolean doRequest = false;

		final int bulkUpdateParams = mWmService.mAnimator.mBulkUpdateParams;
		if ((bulkUpdateParams & SET_UPDATE_ROTATION) != 0) {
		mUpdateRotation = true;
		doRequest = true;
		}

		return doRequest;
		}

		private final class MyHandler extends Handler {

		public MyHandler(Looper looper) {

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

+1 −23

Original line number	Diff line number	Diff line
		@@ -65,9 +65,6 @@ public class WindowAnimator {
		/** Time of current animation step. Reset on each iteration */
		long mCurrentTime;

		int mBulkUpdateParams = 0;
		Object mLastWindowFreezeSource;

		private boolean mInitialized = false;

		private Choreographer mChoreographer;
		@@ -145,7 +142,6 @@ public class WindowAnimator {
		final int animationFlags = useShellTransition ? CHILDREN : (TRANSITION \| CHILDREN);
		boolean rootAnimating = false;
		mCurrentTime = frameTimeNs / TimeUtils.NANOS_PER_MS;
		mBulkUpdateParams = 0;
		if (DEBUG_WINDOW_TRACE) {
		Slog.i(TAG, "!!! animate: entry time=" + mCurrentTime);
		}
		@@ -202,8 +198,7 @@ public class WindowAnimator {
		}

		final boolean hasPendingLayoutChanges = root.hasPendingLayoutChanges(this);
		final boolean doRequest = mBulkUpdateParams != 0 && root.copyAnimToLayoutParams();
		if (hasPendingLayoutChanges \|\| doRequest) {
		if (hasPendingLayoutChanges) {
		mService.mWindowPlacerLocked.requestTraversal();
		}

		@@ -245,7 +240,6 @@ public class WindowAnimator {

		if (DEBUG_WINDOW_TRACE) {
		Slog.i(TAG, "!!! animate: exit"
		+ " mBulkUpdateParams=" + Integer.toHexString(mBulkUpdateParams)
		+ " hasPendingLayoutChanges=" + hasPendingLayoutChanges);
		}
		}
		@@ -265,17 +259,6 @@ public class WindowAnimator {
		mRunningExpensiveAnimations = runningExpensiveAnimations;
		}

		private static String bulkUpdateParamsToString(int bulkUpdateParams) {
		StringBuilder builder = new StringBuilder(128);
		if ((bulkUpdateParams & WindowSurfacePlacer.SET_UPDATE_ROTATION) != 0) {
		builder.append(" UPDATE_ROTATION");
		}
		if ((bulkUpdateParams & WindowSurfacePlacer.SET_WALLPAPER_ACTION_PENDING) != 0) {
		builder.append(" SET_WALLPAPER_ACTION_PENDING");
		}
		return builder.toString();
		}

		public void dumpLocked(PrintWriter pw, String prefix, boolean dumpAll) {
		final String subPrefix = " " + prefix;

		@@ -292,11 +275,6 @@ public class WindowAnimator {
		pw.print(prefix); pw.print("mCurrentTime=");
		pw.println(TimeUtils.formatUptime(mCurrentTime));
		}
		if (mBulkUpdateParams != 0) {
		pw.print(prefix); pw.print("mBulkUpdateParams=0x");
		pw.print(Integer.toHexString(mBulkUpdateParams));
		pw.println(bulkUpdateParamsToString(mBulkUpdateParams));
		}
		}

		void scheduleAnimation() {

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -42,9 +42,6 @@ class WindowSurfacePlacer {
		/** Only do a maximum of 6 repeated layouts. After that quit */
		private int mLayoutRepeatCount;

		static final int SET_UPDATE_ROTATION = 1 << 0;
		static final int SET_WALLPAPER_ACTION_PENDING = 1 << 1;

		private boolean mTraversalScheduled;
		private int mDeferDepth = 0;
		/** The number of layout requests when deferring. */