From 661d866a018dcf5ae87326e770ca782815dfda4e Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 14 Apr 2020 14:47:32 -0700 Subject: [PATCH] Add intent flags back to TaskInfo's base intent - In ag/10502484 we cloned the task info's base intent filtering out the extras and data, but this also filters out the flags, which are used by the AppTaskTests to check whether it was actually marked as excluded. We can add it back to the task info since it doesn't cost anything. Bug: 151123429 Test: atest CtsAppTestCases:AppTaskTests#testSetExcludeFromRecents Change-Id: Ib616f63a3ed76d82a0e68149855568e7a6155b24 --- services/core/java/com/android/server/wm/Task.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index ad1a205a4910f..ba623201fc3d5 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -3457,7 +3457,9 @@ class Task extends WindowContainer { final Intent baseIntent = getBaseIntent(); // Make a copy of base intent because this is like a snapshot info. // Besides, {@link RecentTasks#getRecentTasksImpl} may modify it. + final int baseIntentFlags = baseIntent == null ? 0 : baseIntent.getFlags(); info.baseIntent = baseIntent == null ? new Intent() : baseIntent.cloneFilter(); + info.baseIntent.setFlags(baseIntentFlags); info.baseActivity = mReuseActivitiesReport.base != null ? mReuseActivitiesReport.base.intent.getComponent() : null;