From 8d20621ad418599a12593b64b7241c079d9b7d5f Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Wed, 2 Jan 2019 15:44:27 +0800
Subject: [PATCH] Avoid crash in bindService()

---
 .../main/java/com/hippo/ehviewer/EhApplication.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.java b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
index 0702d6c5f..a1a2255fa 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.java
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
@@ -22,6 +22,7 @@ import android.content.ComponentCallbacks2;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
@@ -358,6 +359,7 @@ public class EhApplication extends RecordingApplication {
         }
     }
 
+    // Avoid crash on some "energy saving" devices
     @Override
     public ComponentName startService(Intent service) {
         try {
@@ -367,4 +369,15 @@ public class EhApplication extends RecordingApplication {
             return null;
         }
     }
+
+    // Avoid crash on some "energy saving" devices
+    @Override
+    public boolean bindService(Intent service, ServiceConnection conn, int flags) {
+        try {
+            return super.bindService(service, conn, flags);
+        } catch (Throwable t) {
+            ExceptionUtils.throwIfFatal(t);
+            return false;
+        }
+    }
 }