Merge "Revert "Handle not having main window in createThumbnailAppAnimator."" into oc-dev

am: 646038a3c3 Change-Id: I9f6b1b84261d39d2db578011b78c52a516b54bab
2017-05-31 21:58:03 +00:00
parent 5288d90af8 646038a3c3
commit 9ad251e43b
1 changed files with 1 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
+++ b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
@@ -693,8 +693,7 @@ class WindowSurfacePlacer {
            SurfaceControl surfaceControl = new SurfaceControl(mService.mFxSession,
                    "thumbnail anim", dirty.width(), dirty.height(),
                    PixelFormat.TRANSLUCENT, SurfaceControl.HIDDEN,
-                    appToken.windowType,
-                    window != null ? window.mOwnerUid : Binder.getCallingUid());
+                    appToken.windowType, window.mOwnerUid);
            surfaceControl.setLayerStack(display.getLayerStack());
            if (SHOW_TRANSACTIONS) {
                Slog.i(TAG, "  THUMBNAIL " + surfaceControl + ": CREATE");