commit f46013b67219b0b2e95fcebb0e51e9816ab0ce94
author Hung-ying Tyan <tyanh@google.com> Tue Jan 18 02:25:52 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 18 02:25:52 2011 -0800
tree e8ab58bd7d809f84c1f0fe038c3437e7dd39e04d
parent 40f2cacbc9ab00d34c2a4f49519921bbf6b5293a
parent e9b54077274d0c4066093cd90dabca59b3d9a157

Merge "Merge "SipService: registers broadcast receivers on demand."" into honeycomb

voip/java/com/android/server/sip/SipService.java

diff --git a/voip/java/com/android/server/sip/SipService.java b/voip/java/com/android/server/sip/SipService.java
index afdc2c2..dc66989 100644
--- a/voip/java/com/android/server/sip/SipService.java
+++ b/voip/java/com/android/server/sip/SipService.java
@@ -1070,7 +1070,10 @@
                 // we want to skip the interim ones) but deliver bad news
                 // immediately
                 if (connected) {
-                    if (mTask != null) mTask.cancel();
+                    if (mTask != null) {
+                        mTask.cancel();
+                        mMyWakeLock.release(mTask);
+                    }
                     mTask = new MyTimerTask(type, connected);
                     mTimer.schedule(mTask, 2 * 1000L);
                     // hold wakup lock so that we can finish changes before the
@@ -1111,6 +1114,7 @@
                     if (mTask != this) {
                         Log.w(TAG, "  unexpected task: " + mNetworkType
                                 + (mConnected ? " CONNECTED" : "DISCONNECTED"));
+                        mMyWakeLock.release(this);
                         return;
                     }
                     mTask = null;