Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

Commit

Permalink
[Android] Fix potential NPE (#2663)
Browse files Browse the repository at this point in the history
  • Loading branch information
YorkShen authored and lucky-chen committed Jul 9, 2019
1 parent 32fac76 commit ce01b5b
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/
package com.taobao.weex;

import static com.taobao.weex.common.WXErrorCode.WX_ERR_JSC_CRASH;
import static com.taobao.weex.common.WXErrorCode.WX_ERR_RELOAD_PAGE;
import static com.taobao.weex.http.WXHttpUtil.KEY_USER_AGENT;

Expand Down Expand Up @@ -72,9 +71,9 @@
import com.taobao.weex.instance.InstanceOnFireEventInterceptor;
import com.taobao.weex.layout.ContentBoxMeasurement;
import com.taobao.weex.performance.WXInstanceApm;
import com.taobao.weex.render.WXAbstractRenderContainer;
import com.taobao.weex.performance.WXStateRecord;
import com.taobao.weex.performance.WhiteScreenUtils;
import com.taobao.weex.render.WXAbstractRenderContainer;
import com.taobao.weex.tracing.WXTracing;
import com.taobao.weex.ui.action.GraphicActionAddElement;
import com.taobao.weex.ui.component.NestedContainer;
Expand All @@ -92,7 +91,6 @@
import com.taobao.weex.utils.WXUtils;
import com.taobao.weex.utils.WXViewUtils;
import com.taobao.weex.utils.cache.RegisterCache;

import java.io.Serializable;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
Expand Down Expand Up @@ -1351,7 +1349,11 @@ public void onActivityPause() {
if (null != mContext){
mContext.sendBroadcast(intent);
}else {
WXEnvironment.getApplication().sendBroadcast(intent);
try {
WXEnvironment.getApplication().sendBroadcast(intent);
} catch (Exception e){
WXLogUtils.e("weex",e);
}
}
this.mCurrentGround = true;
}
Expand Down

0 comments on commit ce01b5b

Please sign in to comment.