aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-05-31 11:54:32 +0200
committeriNPUTmice <daniel@gultsch.de>2014-05-31 11:54:32 +0200
commit57ded7ee588111a4cbe2a4481b56610aa913507a (patch)
tree299247800baa7b30a916deb58ac265702c45a68c
parent655565ecccc722ad72e2dbad247d67dbc1b2a911 (diff)
fixed regression that led to the wakelock not being released again
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index d1692a44..5acde6d4 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -523,7 +523,6 @@ public class XmppConnectionService extends Service {
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- this.wakeLock.acquire();
if ((intent != null)
&& (ACTION_MERGE_PHONE_CONTACTS.equals(intent.getAction()))) {
mergePhoneContactsWithRoster();
@@ -533,6 +532,7 @@ public class XmppConnectionService extends Service {
logoutAndSave();
return START_NOT_STICKY;
}
+ this.wakeLock.acquire();
ConnectivityManager cm = (ConnectivityManager) getApplicationContext()
.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();