From 9076eacaaf905b549bcea417fff2385a64c2b86d Mon Sep 17 00:00:00 2001
From: Yuncheol Heo <ycheo@google.com>
Date: Sun, 10 Nov 2019 11:32:27 -0800
Subject: Make onActivityViewDestroyed called when AV is released.

Test: WmTests:TaskStackChangedListenerTest#testSingleTaskDisplayEmpty
Change-Id: I1271edb08b65b3ca29f92b237d0a65defb7bb38a
---
 core/java/android/app/ActivityView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/java/android/app/ActivityView.java')

diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java
index 79ab67ac148c..91f8a3c7be85 100644
--- a/core/java/android/app/ActivityView.java
+++ b/core/java/android/app/ActivityView.java
@@ -412,8 +412,8 @@ public class ActivityView extends ViewGroup implements TaskEmbedder.Host {
             return;
         }
         mSurfaceView.getHolder().removeCallback(mSurfaceCallback);
-        mTaskEmbedder.setListener(null);
         mTaskEmbedder.release();
+        mTaskEmbedder.setListener(null);
 
         mGuard.close();
         mOpened = false;
-- 
cgit v1.2.3