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

2010-09-22 09:35:35 -07:00
parent 4f294558aa fc51f2c972
commit ca54cdaf66
1 changed files with 3 additions and 3 deletions
--- 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);