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
This commit is contained in:
TreeHugger Robot
2017-08-17 18:38:04 +00:00
committed by Android (Google) Code Review
parent 36d3f3fd02 eafe737ac3
commit 1b08a4a8a3
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.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) {