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

Make sure surface control is really valid before giving it to client

Browse Source 
Checking mSurfaceControl!=null is not enough to ensure the surface is
valid. tryStartExitingAnimation() could destroy/save the surface before
app is stopped, if it decided the surface is no longer needed.

Use WSA.hasSurface() to check if the surface control is really valid.

bug: 30766796
Change-Id: I7724f1929d4ebc3f9a7a3b19eec638d7a7d7b910
This commit is contained in:
Chong Zhang
2016-08-22 09:35:39 -07:00
parent 4ecc9d2db4
commit 7581cddf25
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -2908,12 +2908,11 @@ public class WindowManagerService extends IWindowManager.Stub
}
result |= RELAYOUT_RES_SURFACE_CHANGED;
}
final WindowSurfaceController surfaceController = winAnimator.mSurfaceController;
if (viewVisibility == View.VISIBLE && surfaceController != null) {
if (viewVisibility == View.VISIBLE && winAnimator.hasSurface()) {
// We already told the client to go invisible, but the message may not be
// handled yet, or it might want to draw a last frame. If we already have a
// surface, let the client use that, but don't create new surface at this point.
surfaceController.getSurface(outSurface);
winAnimator.mSurfaceController.getSurface(outSurface);
} else {
if (DEBUG_VISIBILITY) Slog.i(TAG_WM, "Releasing surface in: " + win);