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

Commit 37b45303 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Remove activity from stopping list when removed from display"

parents 47f52b15 42ba68ce

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

+1 −0
Original line number Diff line number Diff line
@@ -3222,6 +3222,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        getDisplayContent().mUnknownAppVisibilityController.appRemovedOrHidden(this);

        mWmService.mTaskSnapshotController.onAppRemoved(this);

        mStackSupervisor.getActivityMetricsLogger().notifyActivityRemoved(this);

        mStackSupervisor.mStoppingActivities.remove(this);

        waitingToShow = false;



        // TODO(b/169035022): move to a more-appropriate place.

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

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                        final Map.Entry<IBinder, WindowContainerTransaction.Change> entry =

                                entries.next();

                        final WindowContainer wc = WindowContainer.fromBinder(entry.getKey());

                        if (!wc.isAttached()) {

                        if (wc == null || !wc.isAttached()) {

                            Slog.e(TAG, "Attempt to operate on detached container: " + wc);

                            continue;

                        }