From 9dd4bc8bf435b488d375c94213de97780e245a08 Mon Sep 17 00:00:00 2001
From: Charles Chen <charlesccchen@google.com>
Date: Tue, 20 Jul 2021 15:47:23 +0800
Subject: [PATCH] Add hasRunningActivity in TaskFragmentInfo

... for TaskFragmentOrganizer to finish adjacent Activities
altogether.

Test: presubmit
Bug: 189386466
Change-Id: I1fddd9c6708bc9eabec3186433f5ccb34a1e6c2c
---
 .../java/android/window/TaskFragmentInfo.java | 22 ++++++++++++++-----
 .../com/android/server/wm/ActivityRecord.java |  4 ++++
 .../com/android/server/wm/TaskFragment.java   |  1 +
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/core/java/android/window/TaskFragmentInfo.java b/core/java/android/window/TaskFragmentInfo.java
index 45975dbbda0bb..fe25e5726110b 100644
--- a/core/java/android/window/TaskFragmentInfo.java
+++ b/core/java/android/window/TaskFragmentInfo.java
@@ -38,8 +38,8 @@ import java.util.List;
 public final class TaskFragmentInfo implements Parcelable {
 
     /**
-     * Client assigned unique token in {@link TaskFragmentCreationParams#mFragmentToken} to create
-     * this TaskFragment with.
+     * Client assigned unique token in {@link TaskFragmentCreationParams#getFragmentToken()} to
+     * create this TaskFragment with.
      */
     @NonNull
     private final IBinder mFragmentToken;
@@ -50,9 +50,12 @@ public final class TaskFragmentInfo implements Parcelable {
     @NonNull
     private final Configuration mConfiguration = new Configuration();
 
-    /** Whether the TaskFragment contains any child Activity. */
+    /** Whether the TaskFragment contains any child Window Container. */
     private final boolean mIsEmpty;
 
+    /** Whether the TaskFragment contains any running Activity. */
+    private final boolean mHasRunningActivity;
+
     /** Whether this TaskFragment is visible on the window hierarchy. */
     private final boolean mIsVisible;
 
@@ -67,12 +70,13 @@ public final class TaskFragmentInfo implements Parcelable {
 
     public TaskFragmentInfo(
             @NonNull IBinder fragmentToken, @NonNull WindowContainerToken token,
-            @NonNull Configuration configuration, boolean isEmpty, boolean isVisible,
-            List<IBinder> activities, @NonNull Point positionInParent) {
+            @NonNull Configuration configuration, boolean isEmpty, boolean hasRunningActivity,
+            boolean isVisible, @NonNull List<IBinder> activities, @NonNull Point positionInParent) {
         mFragmentToken = requireNonNull(fragmentToken);
         mToken = requireNonNull(token);
         mConfiguration.setTo(configuration);
         mIsEmpty = isEmpty;
+        mHasRunningActivity = hasRunningActivity;
         mIsVisible = isVisible;
         mActivities.addAll(activities);
         mPositionInParent = requireNonNull(positionInParent);
@@ -94,6 +98,10 @@ public final class TaskFragmentInfo implements Parcelable {
         return mIsEmpty;
     }
 
+    public boolean hasRunningActivity() {
+        return mHasRunningActivity;
+    }
+
     public boolean isVisible() {
         return mIsVisible;
     }
@@ -125,6 +133,7 @@ public final class TaskFragmentInfo implements Parcelable {
         return mFragmentToken.equals(that.mFragmentToken)
                 && mToken.equals(that.mToken)
                 && mIsEmpty == that.mIsEmpty
+                && mHasRunningActivity == that.mHasRunningActivity
                 && mIsVisible == that.mIsVisible
                 && getWindowingMode() == that.getWindowingMode()
                 && mActivities.equals(that.mActivities)
@@ -136,6 +145,7 @@ public final class TaskFragmentInfo implements Parcelable {
         mToken = in.readTypedObject(WindowContainerToken.CREATOR);
         mConfiguration.readFromParcel(in);
         mIsEmpty = in.readBoolean();
+        mHasRunningActivity = in.readBoolean();
         mIsVisible = in.readBoolean();
         in.readBinderList(mActivities);
         mPositionInParent = requireNonNull(in.readTypedObject(Point.CREATOR));
@@ -147,6 +157,7 @@ public final class TaskFragmentInfo implements Parcelable {
         dest.writeTypedObject(mToken, flags);
         mConfiguration.writeToParcel(dest, flags);
         dest.writeBoolean(mIsEmpty);
+        dest.writeBoolean(mHasRunningActivity);
         dest.writeBoolean(mIsVisible);
         dest.writeBinderList(mActivities);
         dest.writeTypedObject(mPositionInParent, flags);
@@ -172,6 +183,7 @@ public final class TaskFragmentInfo implements Parcelable {
                 + " fragmentToken=" + mFragmentToken
                 + " token=" + mToken
                 + " isEmpty=" + mIsEmpty
+                + " hasRunningActivity=" + mHasRunningActivity
                 + " isVisible=" + mIsVisible
                 + " positionInParent=" + mPositionInParent
                 + "}";
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index f1c783974f750..d1107ae8919f6 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -3445,6 +3445,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
             return;
         }
         finishing = true;
+        final TaskFragment taskFragment = getTaskFragment();
+        if (taskFragment != null) {
+            taskFragment.sendTaskFragmentInfoChanged();
+        }
         if (stopped) {
             abortAndClearOptionsAnimation();
         }
diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index 9159bbb626200..ba13546bed2f9 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -1895,6 +1895,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
                 mRemoteToken.toWindowContainerToken(),
                 getConfiguration(),
                 getChildCount() == 0,
+                hasRunningActivity(this),
                 isVisible(),
                 childActivities,
                 positionInParent);