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

Commit 7a7360ad authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Add null check to setAppGroupId."

parents ec6156f9 32b44d08

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

+7 −2
Original line number Diff line number Diff line
@@ -3336,12 +3336,17 @@ public class WindowManagerService extends IWindowManager.Stub 
        }



        synchronized(mWindowMap) {

            AppWindowToken atoken = findAppWindowToken(token);

            final AppWindowToken atoken = findAppWindowToken(token);

            if (atoken == null) {

                Slog.w(TAG, "Attempted to set group id of non-existing app token: " + token);

                return;

            }

            mTaskIdToDisplayContents.get(atoken.groupId).setAppTaskId(atoken, groupId);

            DisplayContent displayContent = mTaskIdToDisplayContents.get(atoken.groupId);

            if (displayContent == null) {

                Slog.w(TAG, "setAppGroupId: No DisplayContent for taskId=" + atoken.groupId);

                displayContent = getDefaultDisplayContentLocked();

            }

            displayContent.setAppTaskId(atoken, groupId);

        }

    }