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

Commit eedf2a08 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Do not capture activity snapshot if starting window is associated to... 

Merge "Do not capture activity snapshot if starting window is associated to task." into udc-dev am: 1b84c359

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24016743



Change-Id: I7f90524e8c900f7564846ab28a2f70d924f9d174
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd891f0b 1b84c359

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -712,6 +712,14 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            mFlags |= WindowManager.TRANSIT_FLAG_INVISIBLE;

            mFlags |= WindowManager.TRANSIT_FLAG_INVISIBLE;

            return;

            return;

        }

        }

        // Activity doesn't need to capture snapshot if the starting window has associated to task.

        if (wc.asActivityRecord() != null) {

            final ActivityRecord activityRecord = wc.asActivityRecord();

            if (activityRecord.mStartingData != null

                    && activityRecord.mStartingData.mAssociatedTask != null) {

                return;

            }

        }





        if (mContainerFreezer == null) {

        if (mContainerFreezer == null) {

            mContainerFreezer = new ScreenshotFreezer();

            mContainerFreezer = new ScreenshotFreezer();