Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5a1bd42 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Make a copy of base intent for task info 

Restore original logic to fix test failure.

Bug: 133381284
Bug: 119052114
Test: atest TaskRecordTests#testCopyBaseIntentForTaskInfo
Change-Id: I2ddf51f2da08f209fbef496dd109e66ef788b9b8
parent b66d2263

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

+3 −1
Original line number Diff line number Diff line
@@ -3215,7 +3215,9 @@ class Task extends WindowContainer<WindowContainer> { 
        info.displayId = getDisplayId();

        info.isRunning = getTopNonFinishingActivity() != null;

        final Intent baseIntent = getBaseIntent();

        info.baseIntent = baseIntent == null ? new Intent() : baseIntent;

        // Make a copy of base intent because this is like a snapshot info.

        // Besides, {@link RecentTasks#getRecentTasksImpl} may modify it.

        info.baseIntent = baseIntent == null ? new Intent() : new Intent(baseIntent);

        info.baseActivity = mReuseActivitiesReport.base != null

                ? mReuseActivitiesReport.base.intent.getComponent()

                : null;