mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Workaround restart problems

This commit is contained in:
M66B 2015-11-27 20:31:39 +01:00
parent 97c38d1d0a
commit bdc6333af5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -9,7 +9,7 @@ model {
applicationId = "eu.faircode.netguard" applicationId = "eu.faircode.netguard"
minSdkVersion.apiLevel = 21 minSdkVersion.apiLevel = 21
targetSdkVersion.apiLevel = 23 targetSdkVersion.apiLevel = 23
versionCode = 2015112702 versionCode = 2015112704
versionName = "0.44" versionName = "0.44"
archivesBaseName = "NetGuard-v$versionName-$versionCode" archivesBaseName = "NetGuard-v$versionName-$versionCode"
} }

8
app/src/main/java/eu/faircode/netguard/SinkholeService.java
View File

@ -97,8 +97,11 @@ public class SinkholeService extends VpnService {
} finally { } finally {
try { try {
PowerManager.WakeLock wl = getLock(SinkholeService.this); PowerManager.WakeLock wl = getLock(SinkholeService.this);
wl.release(); if (wl.isHeld())
Log.i(TAG, "wakelock=" + wl.isHeld()); wl.release();
else
Log.w(TAG, "Wakelock under-locked");
Log.i(TAG, "Messages=" + hasMessages(0) + " wakelock=" + wlInstance.isHeld());
} catch (Exception ex) { } catch (Exception ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex)); Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
Util.sendCrashReport(ex, SinkholeService.this); Util.sendCrashReport(ex, SinkholeService.this);
@ -460,6 +463,7 @@ public class SinkholeService extends VpnService {
Message msg = mServiceHandler.obtainMessage(); Message msg = mServiceHandler.obtainMessage();
msg.arg1 = startId; msg.arg1 = startId;
msg.obj = intent; msg.obj = intent;
msg.what = 0;
mServiceHandler.sendMessage(msg); mServiceHandler.sendMessage(msg);
return START_STICKY; return START_STICKY;