Merge "Add hasRunningActivity in TaskFragmentInfo" into sc-v2-dev (7d66f8c0) · Commits · e / os / android_frameworks_base

core/java/android/window/TaskFragmentInfo.java

+17 −5

Original line number	Diff line number	Diff line
		@@ -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
		+ "}";

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -3446,6 +3446,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		return;
		}
		finishing = true;
		final TaskFragment taskFragment = getTaskFragment();
		if (taskFragment != null) {
		taskFragment.sendTaskFragmentInfoChanged();
		}
		if (stopped) {
		abortAndClearOptionsAnimation();
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -1895,6 +1895,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
		mRemoteToken.toWindowContainerToken(),
		getConfiguration(),
		getChildCount() == 0,
		hasRunningActivity(this),
		isVisible(),
		childActivities,
		positionInParent);