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

Commit 77b4da7b authored by Chris Li's avatar Chris Li Committed by Gerrit Code Review
Browse files

Merge "ATMS: fix the NPE problem in case the dream activity fails to start." into main

parents f848df33 92c98a7d

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

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








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

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

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

            final int res = getActivityStartController()

                    .obtainStarter(intent, "dream")

                    .setCallingUid(callingUid)

                    .setCallingUid(callingUid)

                    .setCallingPid(callingPid)

                    .setCallingPid(callingPid)

                    .setCallingPackage(intent.getPackage())

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

                    .execute();





            final ActivityRecord started = outActivity[0];

            final ActivityRecord started = outActivity[0];

            final IAppTask appTask = started == null ? null :

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

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

                // start the dream activity failed.

            return appTask;

                return null;

            }

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

        }

        }

    }

    }