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

Commit 58476341 authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

Merge "Fix NPE when WindowManagerDebugConfig.DEBUG_SCREENSHOT is true" into nyc-dev 

am: cc3cb5a0

* commit 'cc3cb5a0':
  Fix NPE when WindowManagerDebugConfig.DEBUG_SCREENSHOT is true

Change-Id: I3c51994471520043918b74ba3a056e73dcc9cd7d
parents 47eeeb56 cc3cb5a0

services/core/java/com/android/server/wm/WindowManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -6290,9 +6290,11 @@ public class WindowManagerService extends IWindowManager.Stub 
                        + maxLayer + " appToken=" + appToken);

                for (int i = 0; i < windows.size(); i++) {

                    WindowState win = windows.get(i);

                    WindowSurfaceController controller = win.mWinAnimator.mSurfaceController;

                    Slog.i(TAG_WM, win + ": " + win.mLayer

                            + " animLayer=" + win.mWinAnimator.mAnimLayer

                            + " surfaceLayer=" + win.mWinAnimator.mSurfaceController.getLayer());

                            + " surfaceLayer=" + ((controller == null)

                                ? "null" : controller.getLayer()));

                }

            }