Merge "Ignore wallpaper enter animation" into sc-dev am: 2a7139a34f

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

Change-Id: Ic35f2e1c873bf8aee1b703c9c7f647ea1392ccbf

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

@@ -683,8 +683,9 @@ class WindowStateAnimator {
         }
 
         // We don't apply animation for application main window here since this window type
-        // should be controlled by AppWindowToken in general.
-        if (mAttrType != TYPE_BASE_APPLICATION) {
+        // should be controlled by ActivityRecord in general. Wallpaper is also excluded because
+        // WallpaperController should handle it.
+        if (mAttrType != TYPE_BASE_APPLICATION && !mIsWallpaper) {
             applyAnimationLocked(transit, true);
         }