diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index e18d56485d47..6870a5d704b3 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2341,6 +2341,12 @@ public class WindowManagerService extends IWindowManager.Stub synchronized(mWindowMap) { final DisplayContent dc = mRoot.getDisplayContent(displayId); + if (dc == null) { + Slog.w(TAG_WM, "addWindowToken: Attempted to add token: " + binder + + " for non-exiting displayId=" + displayId); + return; + } + WindowToken token = dc.getWindowToken(binder); if (token != null) { Slog.w(TAG_WM, "addWindowToken: Attempted to add binder token: " + binder |