From 5804ed79a10657843fb0c9b900054808896f1889 Mon Sep 17 00:00:00 2001
From: tomnatan <tomnatan@google.com>
Date: Mon, 18 Oct 2021 16:06:59 +0000
Subject: [PATCH] Fix issue where NOT_VISIBLE state is sometimes not logged

This happens because ActivityMetricsLogger#notifyActivityRemoved is sometimes called before ActivityMetricsLogger#logAppCompatState is called from ActivityRecord#setVisibility.

Fix: 203417779
Test: atest WmTests:SizeCompatTests
Change-Id: Ib49f8fd6d01a3b6b6797902e8c517b580649a7d8
---
 services/core/java/com/android/server/wm/ActivityRecord.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index dfb2f8ff8bc95..3238621752134 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -4713,6 +4713,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
         if (app != null) {
             mTaskSupervisor.onProcessActivityStateChanged(app, false /* forceBatch */);
         }
+        logAppCompatState();
     }
 
     /**
@@ -4740,7 +4741,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
                 ActivityTaskManagerService.LAYOUT_REASON_VISIBILITY_CHANGED);
         mTaskSupervisor.getActivityMetricsLogger().notifyVisibilityChanged(this);
         mTaskSupervisor.mAppVisibilitiesChangedSinceLastPause = true;
-        logAppCompatState();
     }
 
     @VisibleForTesting