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

Commit 8dd4cfb8 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by The Android Automerger
Browse files

Revert "Revert "Recompute focus stack if cleared while starting an activity."" 

This reverts commit 47e53319.

Some how the reverted CL made it into mnc-dev and and master
when that was the intention...

Bug: 21751387
parent c21f43d9

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+14 −7
Original line number Diff line number Diff line
@@ -2019,15 +2019,22 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                                    r, top.task);

                            top.deliverNewIntentLocked(callingUid, r.intent, r.launchedFromPackage);

                        } else {

                            // A special case: we need to

                            // start the activity because it is not currently

                            // running, and the caller has asked to clear the

                            // current task to have this activity at the top.

                            // A special case: we need to start the activity because it is not

                            // currently running, and the caller has asked to clear the current

                            // task to have this activity at the top.

                            addingToTask = true;

                            // Now pretend like this activity is being started

                            // by the top of its task, so it is put in the

                            // right place.

                            // Now pretend like this activity is being started by the top of its

                            // task, so it is put in the right place.

                            sourceRecord = intentActivity;

                            TaskRecord task = sourceRecord.task;

                            if (task != null && task.stack == null) {

                                // Target stack got cleared when we all activities were removed

                                // above. Go ahead and reset it.

                                targetStack = computeStackFocus(sourceRecord, false /* newTask */);

                                targetStack.addTask(

                                        task, !launchTaskBehind /* toTop */, false /* moving */);

                            }



                        }

                    } else if (r.realActivity.equals(intentActivity.task.realActivity)) {

                        // In this case the top activity on the task is the