commit 9076eacaaf905b549bcea417fff2385a64c2b86d
author Yuncheol Heo <ycheo@google.com> Sun Nov 10 11:32:27 2019 -0800
committer Yuncheol Heo <ycheo@google.com> Sun Nov 10 11:34:08 2019 -0800
tree 184f6ddbaabf1bf37376221c396f535b32fe6dc8
parent 2e82e39c56aa9b0f24af74fe27933de9f95c44a0

Make onActivityViewDestroyed called when AV is released.

Test: WmTests:TaskStackChangedListenerTest#testSingleTaskDisplayEmpty
Change-Id: I1271edb08b65b3ca29f92b237d0a65defb7bb38a

core/java/android/app/ActivityView.java

diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java
index 79ab67a..91f8a3c 100644
--- a/core/java/android/app/ActivityView.java
+++ b/core/java/android/app/ActivityView.java
@@ -412,8 +412,8 @@
             return;
         }
         mSurfaceView.getHolder().removeCallback(mSurfaceCallback);
-        mTaskEmbedder.setListener(null);
         mTaskEmbedder.release();
+        mTaskEmbedder.setListener(null);
 
         mGuard.close();
         mOpened = false;