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

Commit 42ba68ce authored by Louis Chang's avatar Louis Chang
Browse files

Remove activity from stopping list when removed from display 

Organized tasks and its children were removed when systemui died.
And the activities should no longer waiting to be stopped.

Also prevent NPE if the transaction is applied to a unknown WC.

Bug: 170451499
Test: presubmit tests
Change-Id: I2fcef2ffc8c962c0dac3b56cdbea4f17e071152d
parent 29f12866

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

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

        getDisplayContent().mUnknownAppVisibilityController.appRemovedOrHidden(this);

        mWmService.mTaskSnapshotController.onAppRemoved(this);

        mWmService.mTaskSnapshotController.onAppRemoved(this);

        mStackSupervisor.getActivityMetricsLogger().notifyActivityRemoved(this);

        mStackSupervisor.getActivityMetricsLogger().notifyActivityRemoved(this);

        mStackSupervisor.mStoppingActivities.remove(this);

        waitingToShow = false;

        waitingToShow = false;





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

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

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

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

                        final Map.Entry<IBinder, WindowContainerTransaction.Change> entry =

                                entries.next();

                                entries.next();

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

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

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

                            continue;

                            continue;

                        }

                        }