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

Commit 9c30befc authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Skip transferring the snapshot's starting data to the next activity" into main

parents 80ab3821 202b4fea

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();

    }

}