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

Commit 4ad428ba authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix wrong import" into nyc-dev am: 4fec5fe6 

am: 6bd7dca2

* commit '6bd7dca2':
  Fix wrong import

Change-Id: I5bc0f14a807a8836d24947dafc9201135f92b58e
parents 18673bf1 6bd7dca2

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

+3 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; 
import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_CONFIG;

import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT;

import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;

import static com.android.server.wm.AppWindowAnimator.PROLONG_ANIMATION_AT_START;

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

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

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
@@ -71,6 +70,8 @@ import android.view.View; 
import android.view.WindowManager.LayoutParams;

import android.view.animation.Animation;



import com.android.server.wm.WindowManagerService.H;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -1052,7 +1053,7 @@ class WindowSurfacePlacer { 
        mService.mSkipAppTransitionAnimation = false;

        mService.mNoAnimationNotifyOnTransitionFinished.clear();



        mService.mH.removeMessages(APP_TRANSITION_TIMEOUT);

        mService.mH.removeMessages(H.APP_TRANSITION_TIMEOUT);



        mService.rebuildAppWindowListLocked();