diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowOrganizerController.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 9868fc1657e2..8f2e60ec1f08 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -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. diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index 0b200e2bd6d2..6a5784435ad6 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -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; } |