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

Commit e25aa04e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not schedule relaunch for local activities"

parents 0d9def8f c9aa51b1

core/java/android/app/ActivityThread.java

+2 −1
Original line number Diff line number Diff line
@@ -4970,7 +4970,8 @@ public final class ActivityThread extends ClientTransactionHandler { 
    private void relaunchAllActivities(boolean preserveWindows) {

        for (Map.Entry<IBinder, ActivityClientRecord> entry : mActivities.entrySet()) {

            final ActivityClientRecord r = entry.getValue();

            if (!r.activity.mFinished) {

            // Schedule relaunch the activity if it is not a local object or finishing.

            if (!r.activity.mFinished && !(r.token instanceof Binder)) {

                if (preserveWindows && r.window != null) {

                    r.mPreserveWindow = true;

                }

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

+1 −2
Original line number Diff line number Diff line
@@ -4006,8 +4006,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        synchronized (mGlobalLock) {

            ActivityRecord record = ActivityRecord.isInStackLocked(token);

            if (record == null) {

                throw new IllegalArgumentException("reportSizeConfigurations: ActivityRecord not "

                        + "found for: " + token);

                return;

            }

            record.setSizeConfigurations(horizontalSizeConfiguration,

                    verticalSizeConfigurations, smallestSizeConfigurations);