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

Fixed holding wakelock after set from notification

This commit is contained in:
M66B 2016-03-22 10:18:22 +01:00
parent e578e8c9f1
commit eb99c51efd
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View File

@ -244,7 +244,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
else
Log.w(TAG, "Wakelock under-locked");
Log.i(TAG, "Messages=" + hasMessages(0) + " wakelock=" + wlInstance.isHeld());
} catch (Exception ex) {
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
Util.sendCrashReport(ex, ServiceSinkhole.this);
}
@ -1707,6 +1707,12 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
if (intent != null && intent.hasExtra(EXTRA_COMMAND) &&
intent.getSerializableExtra(EXTRA_COMMAND) == Command.set) {
set(intent);
return START_STICKY;
}
// Keep awake
getLock(this).acquire();
@ -1731,11 +1737,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
Log.i(TAG, "Start intent=" + intent + " command=" + cmd + " reason=" + reason +
" vpn=" + (vpn != null) + " user=" + (Process.myUid() / 100000));
if (cmd == Command.set)
set(intent);
else
commandHandler.queue(intent);
commandHandler.queue(intent);
return START_STICKY;
}