commit 9828a3afdfe368a6c96581e490f495580f99c4c2
author Charles Chen <charlesccchen@google.com> Fri May 06 15:26:24 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 06 15:26:24 2022 +0000
tree 65bbc51f8d54b2b9c25fb6af734eab58330f4cc8
parent f5f9e93d30e47535a47473157bba0336296695f4
parent f4a5f4ea9f4476a2b962d73dea3d0cb9b49d05e2

Merge "Fix NPE when multi-window not supported" into tm-dev

tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTestBase.java

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTestBase.java b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTestBase.java
index 49586c4..1ec0a11 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTestBase.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTestBase.java
@@ -82,7 +82,9 @@
 
     @After
     public void tearDown() {
-        mTaskFragmentOrganizer.unregisterOrganizer();
+        if (mTaskFragmentOrganizer != null) {
+            mTaskFragmentOrganizer.unregisterOrganizer();
+        }
     }
 
     public static IBinder getActivityToken(@NonNull Activity activity) {