Merge "Removed unused flag ActivityRecord.inPendingTransaction" (340f86f7) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+6 −6

Original line number	Diff line number	Diff line
		@@ -913,12 +913,6 @@
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/AppTransitionController.java"
		},
		"-121104356": {
		"message": "Remove %s: mSurfaceController=%s mAnimatingExit=%b mRemoveOnExit=%b mHasSurface=%b surfaceShowing=%b animating=%b app-animation=%b mWillReplaceWindow=%b inPendingTransaction=%b mDisplayFrozen=%b callers=%s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/WindowState.java"
		},
		"-116086365": {
		"message": "******************** ENABLING SCREEN!",
		"level": "INFO",
		@@ -1333,6 +1327,12 @@
		"group": "WM_DEBUG_REMOTE_ANIMATIONS",
		"at": "com\/android\/server\/wm\/RemoteAnimationController.java"
		},
		"594260654": {
		"message": "Remove %s: mSurfaceController=%s mAnimatingExit=%b mRemoveOnExit=%b mHasSurface=%b surfaceShowing=%b animating=%b app-animation=%b mWillReplaceWindow=%b mDisplayFrozen=%b callers=%s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/WindowState.java"
		},
		"600140673": {
		"message": "checkBootAnimationComplete: Waiting for anim complete",
		"level": "INFO",

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -587,7 +587,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		private long mLastTransactionSequence = Long.MIN_VALUE;
		private int mNumInterestingWindows;
		private int mNumDrawnWindows;
		boolean inPendingTransaction;
		boolean allDrawn;
		private boolean mLastAllDrawn;

		@@ -876,15 +875,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		pw.print(prefix); pw.print("mNumInterestingWindows=");
		pw.print(mNumInterestingWindows);
		pw.print(" mNumDrawnWindows="); pw.print(mNumDrawnWindows);
		pw.print(" inPendingTransaction="); pw.print(inPendingTransaction);
		pw.print(" allDrawn="); pw.print(allDrawn);
		pw.print(" lastAllDrawn="); pw.print(mLastAllDrawn);
		pw.println(")");
		}
		if (inPendingTransaction) {
		pw.print(prefix); pw.print("inPendingTransaction=");
		pw.println(inPendingTransaction);
		}
		if (mStartingData != null \|\| removed \|\| firstWindowDrawn \|\| mIsExiting) {
		pw.print(prefix); pw.print("startingData="); pw.print(mStartingData);
		pw.print(" removed="); pw.print(removed);
		@@ -4036,7 +4030,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// If we are preparing an app transition, then delay changing
		// the visibility of this token until we execute that transition.
		if (okToAnimate() && appTransition.isTransitionSet()) {
		inPendingTransaction = true;
		if (visible) {
		displayContent.mOpeningApps.add(this);
		mEnteringAnimation = true;
		@@ -4070,7 +4063,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		boolean visible, int transit, boolean performLayout, boolean isVoiceInteraction) {

		boolean delayed = false;
		inPendingTransaction = false;
		// Reset the state of mHiddenSetFromTransferredStartingWindow since visibility is actually
		// been set by the app now.
		mHiddenSetFromTransferredStartingWindow = false;

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -2016,14 +2016,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
		"Remove %s: mSurfaceController=%s mAnimatingExit=%b mRemoveOnExit=%b "
		+ "mHasSurface=%b surfaceShowing=%b animating=%b app-animation=%b "
		+ "mWillReplaceWindow=%b inPendingTransaction=%b mDisplayFrozen=%b "
		+ "callers=%s",
		+ "mWillReplaceWindow=%b mDisplayFrozen=%b callers=%s",
		this, mWinAnimator.mSurfaceController, mAnimatingExit, mRemoveOnExit,
		mHasSurface, mWinAnimator.getShown(),
		isAnimating(TRANSITION \| PARENTS),
		mActivityRecord != null && mActivityRecord.isAnimating(TRANSITION),
		mWillReplaceWindow,
		mActivityRecord != null && mActivityRecord.inPendingTransaction,
		mWmService.mDisplayFrozen, Debug.getCallers(6));

		// Visibility of the removed window. Will be used later to update orientation later on.