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

Commit 2a5c839d authored by Martijn Coenen's avatar Martijn Coenen
Browse files

Fix getDefaultDisplayHomeActivityForUser.

And check for null HomeActivity record, To fix NullPointerException
in ActivityManagerService.

Bug: 116875894
Test: builds
Change-Id: I543c235011bf668e0b1bfbc4252a41c49490ac27
parent 50619770
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -2611,8 +2611,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
    }

    ActivityRecord getDefaultDisplayHomeActivityForUser(int userId) {
        getActivityDisplay(DEFAULT_DISPLAY).getHomeActivityForUser(userId);
        return null;
        return getActivityDisplay(DEFAULT_DISPLAY).getHomeActivityForUser(userId);
    }

    void resizeStackLocked(ActivityStack stack, Rect bounds, Rect tempTaskBounds,
+5 −2
Original line number Diff line number Diff line
@@ -6296,8 +6296,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
                            FLAG_ACTIVITY_TASK_ON_HOME);
                    ActivityOptions activityOptions = options != null
                            ? new ActivityOptions(options) : ActivityOptions.makeBasic();
                    activityOptions.setLaunchTaskId(
                            mStackSupervisor.getDefaultDisplayHomeActivity().getTask().taskId);
                    final ActivityRecord homeActivity =
                            mStackSupervisor.getDefaultDisplayHomeActivity();
                    if (homeActivity != null) {
                        activityOptions.setLaunchTaskId(homeActivity.getTask().taskId);
                    }
                    mContext.startActivityAsUser(intent, activityOptions.toBundle(),
                            UserHandle.CURRENT);
                } finally {