Merge "Add intent flags back to TaskInfo's base intent" into rvc-dev am: 73654f1200 am: 62ea042147

Change-Id: I542d5e36e1e27936dc64be403ee7862ca72e18ce

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

@@ -3388,7 +3388,9 @@ class Task extends WindowContainer<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;