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

Commit 92c98a7d authored by lijilou's avatar lijilou
Browse files

ATMS: fix the NPE problem in case the dream activity fails to start. 

When start the dream activity：
Firstly, the activityrecord of the dream activity is first created in the executeRequest method, and the task of the activityrecord is empty at this time.
Secondly, the startActivityInner method is called to create or get the task, but before calling the setNewTask method, there may be some startup failures, so the task of the activityrecord is still empty at this time.
Finally, our solution is to determine the result of launching the activity.

Test: OEM monkey test
Flag: EXEMPT bugfix
Bug: 381804032
Change-Id: Id7b78f2403580d752609b43fcb24a084b8a91818
parent 1adb0dbc

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

+7 −4
Original line number Diff line number Diff line
@@ -1535,7 +1535,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 




            final ActivityRecord[] outActivity = new ActivityRecord[1];

            getActivityStartController().obtainStarter(intent, "dream")

            final int res = getActivityStartController()

                    .obtainStarter(intent, "dream")

                    .setCallingUid(callingUid)

                    .setCallingPid(callingPid)

                    .setCallingPackage(intent.getPackage())
@@ -1549,9 +1550,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                    .execute();



            final ActivityRecord started = outActivity[0];

            final IAppTask appTask = started == null ? null :

                    new AppTaskImpl(this, started.getTask().mTaskId, callingUid);

            return appTask;

            if (started == null || !ActivityManager.isStartResultSuccessful(res)) {

                // start the dream activity failed.

                return null;

            }

            return new AppTaskImpl(this, started.getTask().mTaskId, callingUid);

        }

    }