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

Commit a1a9b062 authored by Marzia Favaro's avatar Marzia Favaro Committed by Automerger Merge Worker
Browse files

Merge "Add wallpaper to sync set during collection" into udc-qpr-dev am: 5f2babc0 am: c0fc41c0 

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



Change-Id: I0a7cb4c26639a285ffa3c177e85fa4f7942e1406
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2c13430 c0fc41c0

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

+2 −6
Original line number Diff line number Diff line
@@ -615,12 +615,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            }

        }

        if (mParticipants.contains(wc)) return;

        // Wallpaper is like in a static drawn state unless display may have changes, so exclude

        // the case to reduce transition latency waiting for the unchanged wallpaper to redraw.

        final boolean needSync = (!isWallpaper(wc) || mParticipants.contains(wc.mDisplayContent))

        // Transient-hide may be hidden later, so no need to request redraw.

                && !isInTransientHide(wc);

        if (needSync) {

        if (!isInTransientHide(wc)) {

            mSyncEngine.addToSyncSet(mSyncId, wc);

        }

        ChangeInfo info = mChanges.get(wc);

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

+1 −1
Original line number Diff line number Diff line
@@ -5665,7 +5665,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        }

        if (mIsWallpaper) {

            // TODO(b/233286785): Add sync support to wallpaper.

            return false;

            return true;

        }

        // In the WindowContainer implementation we immediately mark ready

        // since a generic WindowContainer only needs to wait for its