Merge "Revert "Handle not having main window in createThumbnailAppAnimator."" into oc-dev am: 646038a3c3

am: 9ad251e43b Change-Id: Iaddbb28b25642c6128bc8f0705b8f241b42e2071
2017-05-31 22:07:09 +00:00
parent ef9b399d7a 9ad251e43b
commit b4e91353b6
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");