diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-30 12:02:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 12:02:03 -0700 |
| commit | d161479237010cb2b7bc8dab0fbbce2cf0170ecf (patch) | |
| tree | 3adcbc94b54706c2c7fd11a498afc45945b0b5e3 /voip/java/android/net/sip | |
| parent | db9e87b98874bba9f26c8d0745639dfbe11195df (diff) | |
| parent | 947d2abd82ef68c661fc29fd5167e4c0ba749f71 (diff) | |
| download | frameworks_base-d161479237010cb2b7bc8dab0fbbce2cf0170ecf.zip frameworks_base-d161479237010cb2b7bc8dab0fbbce2cf0170ecf.tar.gz frameworks_base-d161479237010cb2b7bc8dab0fbbce2cf0170ecf.tar.bz2 | |
am 947d2abd: am 2365b78e: Merge "SIP: misc fixes." into gingerbread
Merge commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71'
* commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71':
SIP: misc fixes.
Diffstat (limited to 'voip/java/android/net/sip')
| -rw-r--r-- | voip/java/android/net/sip/SipManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java index 59631c1..52f5716 100644 --- a/voip/java/android/net/sip/SipManager.java +++ b/voip/java/android/net/sip/SipManager.java @@ -520,7 +520,9 @@ public class SipManager { private String getUri(ISipSession session) { try { - return session.getLocalProfile().getUriString(); + return ((session == null) + ? "no session" + : session.getLocalProfile().getUriString()); } catch (RemoteException e) { throw new RuntimeException(e); } |