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

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

Merge "Remove flag exclude_non_main_window_from_snapshot" into main

parents 311db293 32172572

core/java/android/window/flags/windowing_frontend.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -383,17 +383,6 @@ flag { 
    }

}



flag {

    name: "exclude_non_main_window_from_snapshot"

    namespace: "windowing_frontend"

    description: "Exclude non-main windows during their removal from being captured in the snapshot."

    bug: "412295455"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "predictive_back_delay_wm_transition"

    namespace: "windowing_frontend"

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

+5 −7
Original line number Diff line number Diff line
@@ -308,13 +308,11 @@ abstract class AbsAppSnapshotController<TYPE extends WindowContainer<?>, 
        if (navWindow != null) {

            excludeSurfaces.add(navWindow.getSurfaceControl());

        }

        if (Flags.excludeNonMainWindowFromSnapshot()) {

        source.forAllWindows(w -> {

            if (w.mAnimatingExit && !w.mRemoved && w.mAttrs.type != TYPE_BASE_APPLICATION) {

                excludeSurfaces.add(w.getSurfaceControl());

            }

        }, true /* traverseTopToBottom */);

        }

        final SurfaceControl[] excludeLayers =

                excludeSurfaces.toArray(new SurfaceControl[excludeSurfaces.size()]);

        builder.setHasImeSurface(!excludeIme && imeWindow != null && imeWindow.isVisible());

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

+1 −2
Original line number Diff line number Diff line
@@ -2379,8 +2379,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
                    mActivityRecord != null && mActivityRecord.inTransition(),

                    Debug.getCallers(6));



            if (Flags.excludeNonMainWindowFromSnapshot()

                    && mAttrs.type != TYPE_BASE_APPLICATION && mHasSurface

            if (mAttrs.type != TYPE_BASE_APPLICATION && mHasSurface

                    && mActivityRecord != null && !mActivityRecord.isVisibleRequested()

                    && mWinAnimator.getShown()) {

                // Only remove the activity snapshot, because the user might still want to see the