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

Commit ee1350aa authored by wilsonshih's avatar wilsonshih
Browse files

Fix incorrect calculation of activity snapshot ID 

When a task change is involved in an activity transition, the activity
snapshot ID can be incorrectly calculated as zero. This occurs if a
duplicate activity is added to ActivitiesByTask.
In addition to the incorrect ID, the snapshot is also cleared
immediately because putSnapshot is called again with the same activity.

Flag: EXEMPT bugfix
Bug: 424273966
Test: atest ActivitySnapshotControllerTests
Change-Id: I9c4d4a46fb60706363da8ddb851b0fd930168193
parent adc7eab3

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

+4 −4
Original line number Diff line number Diff line
@@ -167,10 +167,10 @@ class SnapshotController { 
            final ArrayList<ActivityRecord> mCloseActivities = new ArrayList<>();



            void add(ActivityRecord ar) {

                if (ar.isVisibleRequested()) {

                    mOpenActivities.add(ar);

                } else {

                    mCloseActivities.add(ar);

                final ArrayList<ActivityRecord> targetList = ar.isVisibleRequested()

                        ? mOpenActivities : mCloseActivities;

                if (!targetList.contains(ar)) {

                    targetList.add(ar);

                }

            }