diff options
author | Hung-ying Tyan <tyanh@google.com> | 2010-09-30 13:36:37 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 13:36:37 -0700 |
commit | e0ed9dbcb8f3b67f66a1b2a1df264e3aee0bb81c (patch) | |
tree | 751abf3529ec5d1d7468c6d29f11e095e81ff4fc /voip/java/android/net/sip | |
parent | bf45f19435851c8c578d6edabb761e1f4c51da8e (diff) | |
parent | c79e74ec1d30f95de89568ee645a9b1577ae73b3 (diff) | |
download | frameworks_base-e0ed9dbcb8f3b67f66a1b2a1df264e3aee0bb81c.zip frameworks_base-e0ed9dbcb8f3b67f66a1b2a1df264e3aee0bb81c.tar.gz frameworks_base-e0ed9dbcb8f3b67f66a1b2a1df264e3aee0bb81c.tar.bz2 |
am c79e74ec: am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread
Merge commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3'
* commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3':
Add uri field to SipManager.ListenerRelay
Diffstat (limited to 'voip/java/android/net/sip')
-rw-r--r-- | voip/java/android/net/sip/SipManager.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java index 52f5716..a589fe9 100644 --- a/voip/java/android/net/sip/SipManager.java +++ b/voip/java/android/net/sip/SipManager.java @@ -173,7 +173,7 @@ public class SipManager { SipRegistrationListener listener) throws SipException { try { mSipService.open3(localProfile, incomingCallBroadcastAction, - createRelay(listener)); + createRelay(listener, localProfile.getUriString())); } catch (RemoteException e) { throw new SipException("open()", e); } @@ -191,7 +191,7 @@ public class SipManager { SipRegistrationListener listener) throws SipException { try { mSipService.setRegistrationListener( - localProfileUri, createRelay(listener)); + localProfileUri, createRelay(listener, localProfileUri)); } catch (RemoteException e) { throw new SipException("setRegistrationListener()", e); } @@ -425,8 +425,8 @@ public class SipManager { public void register(SipProfile localProfile, int expiryTime, SipRegistrationListener listener) throws SipException { try { - ISipSession session = mSipService.createSession( - localProfile, createRelay(listener)); + ISipSession session = mSipService.createSession(localProfile, + createRelay(listener, localProfile.getUriString())); session.register(expiryTime); } catch (RemoteException e) { throw new SipException("register()", e); @@ -446,8 +446,8 @@ public class SipManager { public void unregister(SipProfile localProfile, SipRegistrationListener listener) throws SipException { try { - ISipSession session = mSipService.createSession( - localProfile, createRelay(listener)); + ISipSession session = mSipService.createSession(localProfile, + createRelay(listener, localProfile.getUriString())); session.unregister(); } catch (RemoteException e) { throw new SipException("unregister()", e); @@ -475,8 +475,8 @@ public class SipManager { } private static ISipSessionListener createRelay( - SipRegistrationListener listener) { - return ((listener == null) ? null : new ListenerRelay(listener)); + SipRegistrationListener listener, String uri) { + return ((listener == null) ? null : new ListenerRelay(listener, uri)); } /** @@ -512,16 +512,18 @@ public class SipManager { private static class ListenerRelay extends SipSessionAdapter { private SipRegistrationListener mListener; + private String mUri; // listener must not be null - public ListenerRelay(SipRegistrationListener listener) { + public ListenerRelay(SipRegistrationListener listener, String uri) { mListener = listener; + mUri = uri; } private String getUri(ISipSession session) { try { return ((session == null) - ? "no session" + ? mUri : session.getLocalProfile().getUriString()); } catch (RemoteException e) { throw new RuntimeException(e); |