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
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user