diff options
| author | Conley Owens <cco3@android.com> | 2011-08-02 13:32:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-02 13:32:26 -0700 |
| commit | 8d92d33f6e69067721a9ed402d0c3276fb0befd6 (patch) | |
| tree | 4f68f2bf75fcae196c4d653452c9067b4253585b | |
| parent | ff0c3ac9f0e9aa22c0d4cc2b1ca051e1974287ea (diff) | |
| parent | 59ccfe8526aae531d69989ac29d1eacd0938d7d2 (diff) | |
| download | android_frameworks_opt_net_voip-8d92d33f6e69067721a9ed402d0c3276fb0befd6.tar.gz android_frameworks_opt_net_voip-8d92d33f6e69067721a9ed402d0c3276fb0befd6.tar.bz2 android_frameworks_opt_net_voip-8d92d33f6e69067721a9ed402d0c3276fb0befd6.zip | |
am 0793586b: am f8c1f129: am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '0793586bf8f4dce71d0b4d7ff2f212129b3f76fe':
Prevent NullPointerException cases while using SipService.
| -rw-r--r-- | java/android/net/sip/SipManager.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/java/android/net/sip/SipManager.java b/java/android/net/sip/SipManager.java index dce46fe..cd0b5c4 100644 --- a/java/android/net/sip/SipManager.java +++ b/java/android/net/sip/SipManager.java @@ -471,6 +471,10 @@ public class SipManager { try { ISipSession session = mSipService.createSession(localProfile, createRelay(listener, localProfile.getUriString())); + if (session == null) { + throw new SipException( + "SipService.createSession() returns null"); + } session.register(expiryTime); } catch (RemoteException e) { throw new SipException("register()", e); @@ -492,6 +496,10 @@ public class SipManager { try { ISipSession session = mSipService.createSession(localProfile, createRelay(listener, localProfile.getUriString())); + if (session == null) { + throw new SipException( + "SipService.createSession() returns null"); + } session.unregister(); } catch (RemoteException e) { throw new SipException("unregister()", e); @@ -513,7 +521,7 @@ public class SipManager { try { String callId = getCallId(incomingCallIntent); ISipSession s = mSipService.getPendingSession(callId); - return new SipSession(s); + return ((s == null) ? null : new SipSession(s)); } catch (RemoteException e) { throw new SipException("getSessionFor()", e); } |