From 7225427909880b917c8bd0183f87c3cb74a3a5a7 Mon Sep 17 00:00:00 2001
From: Bryce Lee <brycelee@google.com>
Date: Wed, 31 May 2017 21:22:33 +0000
Subject: [PATCH] Revert "Handle not having main window in
 createThumbnailAppAnimator."

This reverts commit 6db4d15d726b8830ad56766352a79fe0417cb9c2.

Bug:62096254
Reason for revert: Breaking the build due to test references to class

Change-Id: I6021c802d04a3a55a19f54fc94389957c8152ed9
---
 .../core/java/com/android/server/wm/WindowSurfacePlacer.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
index 424b25ec4d9d5..4a1a7052a8b0a 100644
--- a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
+++ b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
@@ -694,8 +694,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");