Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix wrong import" into nyc-dev

Browse Source 
am: 4fec5fe6ef

* commit '4fec5fe6efcf6c3a932b1fe7f2f68264e9d7b604':
  Fix wrong import

Change-Id: If4ef1442f9df2c4e2fb4d7ad4a3bc8adeed916ba
This commit is contained in:
Jorim Jaggi
2016-05-04 00:16:44 +00:00
committed by android-build-merger
parent dd9f819a63 4fec5fe6ef
commit 6bd7dca2c7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WindowSurfacePlacer.java
View File

@@ -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();