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

Commit 4636dc4c authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 7a7360ad: Merge "Add null check to setAppGroupId." 

* commit '7a7360ad':
  Add null check to setAppGroupId.
parents 1b63e60a 7a7360ad

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);

        }

    }