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

Commit e3598941 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Check Activity state before PiP state update 

Check Activity state before sending the PictureInPictureUiState update
to the client. Activity could have been destroyed in app process, while
it's still attached.

Flag: EXEMPT testfix
Bug: 412980276
Test: atest CtsWindowManagerDeviceActivity
Change-Id: I13bc246099e23c21c8e16bfb97f5259ffc2095d3
parent e8638894

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

+6 −1
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ 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;
@@ -4350,7 +4353,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            final ActivityRecord topActivity = task != null

                    ? task.getTopMostActivity()

                    : null;

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

            if (topActivity != null

                    && !topActivity.isState(FINISHING, DESTROYING, DESTROYED)

                    && topActivity.attachedToProcess()) {

                mWindowManager.mAtmService.mActivityClientController

                        .onPictureInPictureUiStateChanged(topActivity, pipState);

            }