ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check existence of mWakeLock before releasing it 

* Also, unregister connectivity receiver in onDestroy method
This commit is contained in:
Marc Blank 2009-08-05 12:58:15 -07:00
parent 5f25162475
commit 25c46808c6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/exchange/SyncManager.java
View File

@ -91,6 +91,7 @@ public class SyncManager extends Service implements Runnable {
MessageObserver mMessageObserver;
String mNextWaitReason;
IEmailServiceCallback mCallback;
ConnectivityReceiver mConnectivityReceiver = null;
RemoteCallbackList<IEmailServiceCallback> mCallbackList =
new RemoteCallbackList<IEmailServiceCallback>();
@ -545,7 +546,9 @@ public class SyncManager extends Service implements Runnable {
INSTANCE.log("+WakeLock not needed for " + alarmOwner(id));
mWakeLocks.remove(id);
if (mWakeLocks.isEmpty()) {
mWakeLock.release();
if (mWakeLock != null) {
mWakeLock.release();
}
mWakeLock = null;
INSTANCE.log("+WAKE LOCK RELEASED");
}
@ -634,6 +637,9 @@ public class SyncManager extends Service implements Runnable {
mWakeLock.release();
mWakeLock = null;
}
if (mConnectivityReceiver != null) {
unregisterReceiver(mConnectivityReceiver);
}
clearAlarms();
}
@ -740,8 +746,9 @@ public class SyncManager extends Service implements Runnable {
resolver.registerContentObserver(Message.SYNCED_CONTENT_URI, true, mSyncedMessageObserver);
resolver.registerContentObserver(Message.CONTENT_URI, false, mMessageObserver);
ConnectivityReceiver cr = new ConnectivityReceiver();
registerReceiver(cr, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
mConnectivityReceiver = new ConnectivityReceiver();
registerReceiver(mConnectivityReceiver,
new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
ConnectivityManager cm =
(ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);