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

Commit c9aa51b1 authored by Louis Chang's avatar Louis Chang
Browse files

Do not schedule relaunch for local activities 

IllegalArgumentException was thrown when reporting size config
for local activities while relaunch.

Bug: 120008604
Test: start ActivtiyGroup activities and update display cutout

Change-Id: If376012cd0741bc7436dc45aeb2f0216aee32a02
parent 276d5d7a

core/java/android/app/ActivityThread.java

+2 −1
Original line number Diff line number Diff line
@@ -4971,7 +4971,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 −3
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ import android.service.voice.IVoiceInteractionSession; 
import android.service.voice.VoiceInteractionManagerInternal;

import android.sysprop.DisplayProperties;

import android.telecom.TelecomManager;

import android.text.TextUtils;

import android.text.format.TimeMigrationUtils;

import android.util.ArrayMap;

import android.util.ArraySet;
@@ -4007,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);