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

Commit 48c0ed08 authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Fix NPE when trying to access task before AppWindowToken attach to one 

This is a race condition. While create AppWindowToken, before attach to
a task container.addChild(), accessing task attached to the token will
cause an NPE. The root cause can be fixed after we unifying Task and
TaskRecord. Just post a temporary solution here to avoid crash.

Bug: 120197396
Test: go/wm-smoke
Change-Id: I37008c16546e02358d9f88d1c9fd544002357137
parent 6f5ea0c1

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

+6 −0
Original line number Diff line number Diff line
@@ -1086,6 +1086,12 @@ final class ActivityRecord extends ConfigurationContainer { 
            Slog.w(TAG_WM, "Attempted to set icon of non-existing app token: " + appToken);

            return false;

        }

        if (mAppWindowToken.getTask() == null) {

            // Can be removed after unification of Task and TaskRecord.

            Slog.w(TAG_WM, "Attempted to start a window to an app token not having attached to any"

                    + " task: " + appToken);

            return false;

        }

        return mAppWindowToken.addStartingWindow(pkg, theme, compatInfo, nonLocalizedLabel,

                labelRes, icon, logo, windowFlags, transferFrom, newTask, taskSwitch,

                processRunning, allowTaskSnapshot, activityCreated, fromRecents);