From 6149d49d70409faacad25e4759a564446c290838 Mon Sep 17 00:00:00 2001 From: YorkShen Date: Fri, 29 Jun 2018 14:46:36 +0800 Subject: [PATCH] Revert "* [Android] Fix potential memory leak." This reverts commit 361df72 and fix memory leak by make instanceWrap not global (cherry picked from commit 07f8250) --- android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java | 2 +- .../src/main/java/com/taobao/weex/bridge/WXModuleManager.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java index b86de3d863..b7f7df6b68 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java @@ -326,7 +326,7 @@ private static void register() { registerComponent(WXBasicComponentType.HEADER, WXHeader.class); registerModule("modal", WXModalUIModule.class, false); - registerModule("instanceWrap", WXInstanceWrap.class, true); + registerModule("instanceWrap", WXInstanceWrap.class, false); registerModule("animation", WXAnimationModule.class, true); registerModule("webview", WXWebViewModule.class, true); registerModule("navigator", WXNavigatorModule.class); diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java index 83aa0b0e4f..c13a442831 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java +++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java @@ -30,7 +30,6 @@ import com.taobao.weex.common.Destroyable; import com.taobao.weex.common.WXErrorCode; import com.taobao.weex.common.WXException; -import com.taobao.weex.common.WXInstanceWrap; import com.taobao.weex.common.WXModule; import com.taobao.weex.ui.config.ConfigModuleFactory; import com.taobao.weex.ui.module.WXDomModule; @@ -184,7 +183,7 @@ static Object callModuleMethod(final String instanceId, String moduleStr, String WXLogUtils.e("callModuleMethod >>> invoke module:" + moduleStr + ", method:" + methodStr + " failed. ", e); return null; } finally { - if (wxModule instanceof WXDomModule || wxModule instanceof WXTimerModule || wxModule instanceof WXInstanceWrap) { + if (wxModule instanceof WXDomModule || wxModule instanceof WXTimerModule) { wxModule.mWXSDKInstance = null; } }