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

Commit 3652fc62 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Continue with the animation if wallpaper fails to draw" into qt-dev am: 7c77aaef 

am: 4ea9a204

Change-Id: If15f102510dd2c61e6a4b21c4b1d5b901fa5ef2f
parents e595dc21 4ea9a204

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;

        }