diff --git a/app/build.gradle b/app/build.gradle
index 6ee4ce5f6d..9ce3326429 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -288,9 +288,9 @@ dependencies {
     androidTestImplementation rootProject.ext.dependencies.localbroadcastmanager
     androidTestImplementation rootProject.ext.dependencies.mogo_v2x
 
-    if (isAndroidTestBuild()) {
-        implementation "com.mogo.thread.opt:lib:${THREAD_OPT_VERSION}"
-    }
+//    if (isAndroidTestBuild()) {
+//        implementation "com.mogo.thread.opt:lib:${THREAD_OPT_VERSION}"
+//    }
 }
 
 if (!isAndroidTestBuild()) {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
index b099c4422b..3ef7faaee2 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
@@ -40,7 +40,7 @@ internal class WarningFloatWindowHelper(
     }
 
     fun createWindow(): Boolean {
-        return if (context is Activity) {
+        return if (context is Activity && !context.isFinishing && !context.isDestroyed) {
             initParams()
             addView()
             config.isShow = true