Revert "* [Android] Fix potential memory leak."

This reverts commit 361df72 and fix memory leak by make instanceWrap not global (cherry picked from commit 07f8250)
apache · Jun 29, 2018 · 6149d49 · 6149d49
1 parent 14aec0d
commit 6149d49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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;
       }
     }