diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-22 09:45:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-22 09:45:41 -0700 |
| commit | bb205456698053b1f77891ee1a94e3ddebee1f10 (patch) | |
| tree | 028169bdf2bee47ea6f0547a2e0f906e034e5a8f /services | |
| parent | 48ff0daae3db57f8d1cb7bff8de299b92e386cd5 (diff) | |
| parent | 8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a (diff) | |
| download | frameworks_base-bb205456698053b1f77891ee1a94e3ddebee1f10.zip frameworks_base-bb205456698053b1f77891ee1a94e3ddebee1f10.tar.gz frameworks_base-bb205456698053b1f77891ee1a94e3ddebee1f10.tar.bz2 | |
am 8f05b5c8: am ca54cdaf: Merge "SipService: fix thread/socket leak" into gingerbread
Merge commit '8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a'
* commit '8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a':
SipService: fix thread/socket leak
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/sip/SipService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/java/com/android/server/sip/SipService.java b/services/java/com/android/server/sip/SipService.java index a2ebc69..f1dcd5a 100644 --- a/services/java/com/android/server/sip/SipService.java +++ b/services/java/com/android/server/sip/SipService.java @@ -172,7 +172,7 @@ public final class SipService extends ISipService.Stub { SipSessionGroupExt group = mSipGroups.remove(localProfileUri); if (group != null) { notifyProfileRemoved(group.getLocalProfile()); - group.closeToNotReceiveCalls(); + group.close(); if (isWifiOn() && !anyOpened()) releaseWifiLock(); } } @@ -449,9 +449,9 @@ public final class SipService extends ISipService.Stub { } } - public void closeToNotReceiveCalls() { + public void close() { mOpened = false; - mSipGroup.closeToNotReceiveCalls(); + mSipGroup.close(); mAutoRegistration.stop(); if (DEBUG) Log.d(TAG, " close: " + getUri() + ": " + mIncomingCallBroadcastAction); |