This is an automated email from the ASF dual-hosted git repository. luckychen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
View the commit online: https://github.com/apache/incubator-weex/commit/0871a1b11096bd44ec578a9f1221d3bfa7fc4ff1 The following commit(s) were added to refs/heads/master by this push: new 0871a1b Merge Release/20190925 into master (#3031) 0871a1b is described below commit 0871a1b11096bd44ec578a9f1221d3bfa7fc4ff1 Author: YorkShen <shenyua...@gmail.com> AuthorDate: Thu Nov 21 11:36:15 2019 +0800 Merge Release/20190925 into master (#3031) * Fix Poplayer multi Thread Native Crash * Revert "Fix Poplayer multi Thread Native Crash" This reverts commit 1d857d3df7100f5fac3856668ad8e71672c870ed. * [Android] fix memleak for apm --- .../sdk/src/main/java/org/apache/weex/performance/WXInstanceApm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/sdk/src/main/java/org/apache/weex/performance/WXInstanceApm.java b/android/sdk/src/main/java/org/apache/weex/performance/WXInstanceApm.java index 273a60e..39d9019 100644 --- a/android/sdk/src/main/java/org/apache/weex/performance/WXInstanceApm.java +++ b/android/sdk/src/main/java/org/apache/weex/performance/WXInstanceApm.java @@ -391,7 +391,7 @@ public class WXInstanceApm { exceptionRecord.clear(); mUIHandler.removeCallbacks(jsPerformanceCallBack); onStage(KEY_PAGE_STAGES_DESTROY); - if (!mHasInit){ + if (mHasInit && null != apmInstance){ apmInstance.onEnd(); } mEnd = true;