From 663ab77a7d358a658d94fa5a71ca5212b1aca329 Mon Sep 17 00:00:00 2001
From: Martin Guillon <martin.guillon@akylas.fr>
Date: Sun, 30 Jan 2022 14:18:53 +0100
Subject: [PATCH] fix(core): android fix for entry cleared too late

---
 packages/core/ui/frame/index.android.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/ui/frame/index.android.ts b/packages/core/ui/frame/index.android.ts
index 9771409d4..01234f4a3 100644
--- a/packages/core/ui/frame/index.android.ts
+++ b/packages/core/ui/frame/index.android.ts
@@ -501,8 +501,9 @@ export class Frame extends FrameBase {
 			const manager: androidx.fragment.app.FragmentManager = this._getFragmentManager();
 			const transaction = manager.beginTransaction();
 			transaction.remove(removed.fragment);
-			transaction.commitNowAllowingStateLoss();
+			// clear entry before commit because commit now will release the fragment right away
 			_clearEntry(removed);
+			transaction.commitNowAllowingStateLoss();
 		}
 
 		removed.fragment = null;