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

Commit b30ace10 authored by Jeff Chang's avatar Jeff Chang Committed by Android (Google) Code Review
Browse files

Merge "Client may use the out of date display ID when add the window token."

parents 8a8f138d f8deb81e

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

+6 −0
Original line number Diff line number Diff line
@@ -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