diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2011-01-06 13:03:30 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2011-01-18 16:50:56 +0800 |
| commit | 40f2cacbc9ab00d34c2a4f49519921bbf6b5293a (patch) | |
| tree | b7cfba163128587a95a1e22693b8c5ffe750df72 /voip/java | |
| parent | 9d0577ec0c285c055da4c910dcb597fdae5bc5e5 (diff) | |
| download | frameworks_base-40f2cacbc9ab00d34c2a4f49519921bbf6b5293a.zip frameworks_base-40f2cacbc9ab00d34c2a4f49519921bbf6b5293a.tar.gz frameworks_base-40f2cacbc9ab00d34c2a4f49519921bbf6b5293a.tar.bz2 | |
Merge "SipService: release wake lock for cancelled tasks."
Bug: 3327004
Change-Id: Ice47f973b5f2969f26eaa83a3e4795b2e153ba8b
Diffstat (limited to 'voip/java')
| -rw-r--r-- | voip/java/com/android/server/sip/SipService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/voip/java/com/android/server/sip/SipService.java b/voip/java/com/android/server/sip/SipService.java index 3af6e78..8945d1e 100644 --- a/voip/java/com/android/server/sip/SipService.java +++ b/voip/java/com/android/server/sip/SipService.java @@ -1055,7 +1055,10 @@ public final class SipService extends ISipService.Stub { // 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 @@ -1096,6 +1099,7 @@ public final class SipService extends ISipService.Stub { if (mTask != this) { Log.w(TAG, " unexpected task: " + mNetworkType + (mConnected ? " CONNECTED" : "DISCONNECTED")); + mMyWakeLock.release(this); return; } mTask = null; |