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

Commit f0759fe1 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Make sure Activity is attached before IPC call" into main

parents b32c16aa 651edc51

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);

            }