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

Commit 651edc51 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Make sure Activity is attached before IPC call 

When trying to send the PictureInPictureUiStateChanged callback to
Activity, the app process could have been killed.

The Activity state check alone is not sufficient enough and an
additional attachedToProcess check is added in this change.

Flag: EXEMPT bugfix
Bug: 407221296
Test: atest PinnedStackTests
Change-Id: Ic1aaa9c1a54291be879413d0ee60c9d7e653080b
parent 65909e46

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

+1 −4
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ import static com.android.server.wm.ActivityInterceptorCallback.MAINLINE_FIRST_O 
import static com.android.server.wm.ActivityInterceptorCallback.MAINLINE_LAST_ORDERED_ID;

import static com.android.server.wm.ActivityInterceptorCallback.SYSTEM_FIRST_ORDERED_ID;

import static com.android.server.wm.ActivityInterceptorCallback.SYSTEM_LAST_ORDERED_ID;

import static com.android.server.wm.ActivityRecord.State.DESTROYED;

import static com.android.server.wm.ActivityRecord.State.DESTROYING;

import static com.android.server.wm.ActivityRecord.State.FINISHING;

import static com.android.server.wm.ActivityRecord.State.PAUSING;

import static com.android.server.wm.ActivityRecord.State.RESUMED;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ACTIVITY_STARTS;
@@ -4353,7 +4350,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            final ActivityRecord topActivity = task != null

                    ? task.getTopMostActivity()

                    : null;

            if (topActivity != null && !topActivity.isState(FINISHING, DESTROYING, DESTROYED)) {

            if (topActivity != null && topActivity.attachedToProcess()) {

                mWindowManager.mAtmService.mActivityClientController

                        .onPictureInPictureUiStateChanged(topActivity, pipState);

            }