Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't call surface.remove if surface is null." into oc-mr1-dev

Browse Source 
am: 1b08a4a8a3

Change-Id: Ibee9f786daefba0d8a38c80e7727f1d6a8ebec88
This commit is contained in:
Seigo Nonaka
2017-08-17 18:48:23 +00:00
committed by android-build-merger
parent db7d85c8e7 1b08a4a8a3
commit 5bee11f577
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/AppWindowContainerController.java
View File

@@ -632,9 +632,12 @@ public class AppWindowContainerController
mContainer.startingSurface = null; mContainer.startingSurface = null;
mContainer.startingWindow = null; mContainer.startingWindow = null;
mContainer.startingDisplayed = false; mContainer.startingDisplayed = false;
if (surface == null && DEBUG_STARTING_WINDOW) { if (surface == null) {
Slog.v(TAG_WM, "startingWindow was set but startingSurface==null, couldn't " if (DEBUG_STARTING_WINDOW) {
+ "remove"); Slog.v(TAG_WM, "startingWindow was set but startingSurface==null, couldn't "
+ "remove");
}
return;
} }
} else { } else {
if (DEBUG_STARTING_WINDOW) { if (DEBUG_STARTING_WINDOW) {