From 9bc2027fc96c700f9f58297c1f829c39e4a37df5 Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Thu, 10 Mar 2022 14:27:15 -0800
Subject: [PATCH] Add null check in transientlaunchrestoretarget

Some sequences of events result in this being null, so
prevent a crash by checking.

Bug: 210014802
Test: manual
Change-Id: Id1b8b5b23d51a9fb5228e7106e2d2614a6d62676
---
 services/core/java/com/android/server/wm/Transition.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index 7f32447963341..21ca4bb6038bf 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -216,6 +216,7 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
     }
 
     Task getTransientLaunchRestoreTarget(@NonNull WindowContainer container) {
+        if (mTransientLaunches == null) return null;
         for (int i = 0; i < mTransientLaunches.size(); ++i) {
             if (mTransientLaunches.keyAt(i).isDescendantOf(container)) {
                 return mTransientLaunches.valueAt(i);