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

Commit 7c77aaef authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Continue with the animation if wallpaper fails to draw" into qt-dev

parents 98edda5b fe57103c

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

+3 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; 
import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER;



import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;

import static com.android.server.wm.RecentsAnimationController.REORDER_MOVE_TO_ORIGINAL_POSITION;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_SCREENSHOT;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WALLPAPER;
@@ -612,10 +611,10 @@ class WallpaperController { 
            if (DEBUG_APP_TRANSITIONS || DEBUG_WALLPAPER) Slog.v(TAG,

                    "*** WALLPAPER DRAW TIMEOUT");



            // If there was a recents animation in progress, cancel that animation

            // If there was a pending recents animation, start the animation anyways (it's better

            // to not see the wallpaper than for the animation to not start)

            if (mService.getRecentsAnimationController() != null) {

                mService.getRecentsAnimationController().cancelAnimation(

                        REORDER_MOVE_TO_ORIGINAL_POSITION, "wallpaperDrawPendingTimeout");

                mService.getRecentsAnimationController().startAnimation();

            }

            return true;

        }