From 2b7d69dbba731c4f8365204dee0c7b78834e36f1 Mon Sep 17 00:00:00 2001 From: Trumeet Date: Wed, 28 Nov 2018 16:53:26 -0800 Subject: fix: ignore "NullPointerException: Attempt to invoke virtual method 'java.lang.String android.content.Intent.resolveTypeIfNeeded(android.content.ContentResolver)' on a null object reference" --- app/src/main/java/moe/yuuta/sysuicontroller/MainFragment.java | 2 +- .../main/java/moe/yuuta/sysuicontroller/core/ControllerService.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'app/src') diff --git a/app/src/main/java/moe/yuuta/sysuicontroller/MainFragment.java b/app/src/main/java/moe/yuuta/sysuicontroller/MainFragment.java index eee945e..ff43d34 100644 --- a/app/src/main/java/moe/yuuta/sysuicontroller/MainFragment.java +++ b/app/src/main/java/moe/yuuta/sysuicontroller/MainFragment.java @@ -321,7 +321,7 @@ public class MainFragment extends PreferenceFragment implements Preference.OnPre } else { try { mService.exit(); - } catch (RemoteException ignored) { + } catch (Throwable ignored) { } } return true; diff --git a/app/src/main/java/moe/yuuta/sysuicontroller/core/ControllerService.java b/app/src/main/java/moe/yuuta/sysuicontroller/core/ControllerService.java index 236f05f..72785d9 100644 --- a/app/src/main/java/moe/yuuta/sysuicontroller/core/ControllerService.java +++ b/app/src/main/java/moe/yuuta/sysuicontroller/core/ControllerService.java @@ -86,7 +86,11 @@ public class ControllerService extends IStatusController.Stub { @Override // Binder call public void exit () throws RemoteException { enforcePermission(); - mContext.removeStickyBroadcast(mKeepWakeUpIntent); + try { + mContext.removeStickyBroadcast(mKeepWakeUpIntent); + } catch (Throwable e) { + Log.e(TAG, "Unable to remove sticky broadcast", e); + } RootDaemon.exit(); } -- cgit v1.2.3-70-g09d2