Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SipService: fix thread/socket leak" into gingerbread

Browse Source
This commit is contained in:
Hung-ying Tyan
2010-09-22 09:35:35 -07:00
committed by Android (Google) Code Review
parent 4f294558aa fc51f2c972
commit ca54cdaf66
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/sip/SipService.java
View File

@@ -172,7 +172,7 @@ public final class SipService extends ISipService.Stub {
SipSessionGroupExt group = mSipGroups.remove(localProfileUri); SipSessionGroupExt group = mSipGroups.remove(localProfileUri);
if (group != null) { if (group != null) {
notifyProfileRemoved(group.getLocalProfile()); notifyProfileRemoved(group.getLocalProfile());
group.closeToNotReceiveCalls(); group.close();
if (isWifiOn() && !anyOpened()) releaseWifiLock(); if (isWifiOn() && !anyOpened()) releaseWifiLock();
} }
} }
@@ -449,9 +449,9 @@ public final class SipService extends ISipService.Stub {
} }
} }
public void closeToNotReceiveCalls() { public void close() {
mOpened = false; mOpened = false;
mSipGroup.closeToNotReceiveCalls(); mSipGroup.close();
mAutoRegistration.stop(); mAutoRegistration.stop();
if (DEBUG) Log.d(TAG, " close: " + getUri() + ": " if (DEBUG) Log.d(TAG, " close: " + getUri() + ": "
+ mIncomingCallBroadcastAction); + mIncomingCallBroadcastAction);