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

Commit 202b4fea authored by wilsonshih's avatar wilsonshih
Browse files

Skip transferring the snapshot's starting data to the next activity 

...if the snapshot is closed. This also implies that the snapshot's
activity was removed from the system server, and therefore the snapshot
starting window should not be used to another activity.

Flag: EXEMPT bugfix
Bug: 405000430
Test: simulate the slow creation of a starting window, and verify that
the snapshot data can be used to create another window after
transferring the starting window.

Change-Id: I9097cc3c55c83fe9a7ddf1f82472174ac47096e8
parent db3e0319

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

+2 −1
Original line number Diff line number Diff line
@@ -4622,7 +4622,8 @@ final class ActivityRecord extends WindowToken { 
            return true;

        } else if (fromActivity.mStartingData != null) {

            if (fromActivity.mStartingData instanceof SnapshotStartingData

                    && !isStartingOrientationCompatible(fromActivity)) {

                    && (!isStartingOrientationCompatible(fromActivity)

                    || !(((SnapshotStartingData) fromActivity.mStartingData).isValid()))) {

                // Do not transfer because the snapshot will be distorted in different orientation.

                return false;

            }

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

+4 −0
Original line number Diff line number Diff line
@@ -49,4 +49,8 @@ class SnapshotStartingData extends StartingData { 
    boolean hasImeSurface() {

        return mSnapshot.hasImeSurface();

    }



    boolean isValid() {

        return !mSnapshot.getHardwareBuffer().isClosed();

    }

}