From 860fbc04ed0b3f83a99043d62602b2b4a8024e28 Mon Sep 17 00:00:00 2001
From: Issei Suzuki <issei@google.com>
Date: Thu, 31 Oct 2019 16:49:35 +0100
Subject: [PATCH] Removed unused flag ActivityRecord.inPendingTransaction

Test: no-op change, still all tests pass
Change-Id: Ib350f75fbdabcb21930e95cc316563168b6f117d
---
 data/etc/services.core.protolog.json                 | 12 ++++++------
 .../java/com/android/server/wm/ActivityRecord.java   |  8 --------
 .../core/java/com/android/server/wm/WindowState.java |  4 +---
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json
index ecdf5373f24fc..1326952a57506 100644
--- a/data/etc/services.core.protolog.json
+++ b/data/etc/services.core.protolog.json
@@ -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",
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index eaf19be2338ae..d347bf1e186ab 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -586,7 +586,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;
 
@@ -875,15 +874,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);
@@ -4035,7 +4029,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;
@@ -4069,7 +4062,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;
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index f7402e1dfea4f..17e67ebf617fa 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -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.