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

Commit 8670fcdf authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary check and prevent unnecessary log" into tm-dev

parents 36ad81c4 e3719bdc

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

+2 −5
Original line number Diff line number Diff line
@@ -2687,11 +2687,8 @@ class ActivityStarter { 
                // launched into the same root task.

                mTargetRootTask = Task.fromWindowContainerToken(mSourceRecord.mLaunchRootTask);

            } else {

                final Task rootTask =

                        getOrCreateRootTask(mStartActivity, mLaunchFlags, intentTask, mOptions);

                // TODO(b/184806710): #getOrCreateRootTask should never return null?

                mTargetRootTask =

                        rootTask != null ? rootTask : intentActivity.getRootTask();

                mTargetRootTask = getOrCreateRootTask(mStartActivity, mLaunchFlags, intentTask,

                        mOptions);

            }

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -2754,7 +2754,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        // First preference goes to the launch root task set in the activity options.

        if (options != null) {

            final Task candidateRoot = Task.fromWindowContainerToken(options.getLaunchRootTask());

            if (canLaunchOnDisplay(r, candidateRoot)) {

            if (candidateRoot != null && canLaunchOnDisplay(r, candidateRoot)) {

                return candidateRoot;

            }

        }