From eafe737ac31c9dcc5b0f42884b4d27c568e255c0 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Wed, 16 Aug 2017 12:39:49 -0700 Subject: Don't call surface.remove if surface is null. This essentially revives the null check removed in I55e2c1b8fba32b3a19603e6ad4743f07576abd48 Test: N/A Bug: 64722384 Change-Id: Ifdbc29df54a1a5aedf0e31e0c461146a3e59917d --- .../java/com/android/server/wm/AppWindowContainerController.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/wm/AppWindowContainerController.java b/services/core/java/com/android/server/wm/AppWindowContainerController.java index e9696d2ab46f..dce06f47c0cb 100644 --- a/services/core/java/com/android/server/wm/AppWindowContainerController.java +++ b/services/core/java/com/android/server/wm/AppWindowContainerController.java @@ -631,9 +631,12 @@ public class AppWindowContainerController mContainer.startingSurface = null; mContainer.startingWindow = null; mContainer.startingDisplayed = false; - if (surface == null && DEBUG_STARTING_WINDOW) { - Slog.v(TAG_WM, "startingWindow was set but startingSurface==null, couldn't " - + "remove"); + if (surface == null) { + if (DEBUG_STARTING_WINDOW) { + Slog.v(TAG_WM, "startingWindow was set but startingSurface==null, couldn't " + + "remove"); + } + return; } } else { if (DEBUG_STARTING_WINDOW) { -- cgit v1.2.3-59-g8ed1b