Merge "Make onActivityViewDestroyed called when AV is released."

2019-11-12 18:39:16 +00:00
parent 7a85df83c2 9076eacaaf
commit fe0e4a2478
1 changed files with 1 additions and 1 deletions
--- 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;