Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3dd655b authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Make sure surface control is really valid before giving it to client am: 7581cddf

am: d3edf1e7

Change-Id: I25cb7bb6a3f87795af75d637bf98b682197f3627
parents 7ed92551 d3edf1e7
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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);