diff options
| author | Conley Owens <cco3@android.com> | 2011-08-02 13:08:14 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-08-02 13:08:14 -0700 |
| commit | f87743e7bdfd10b9a1719036a6320a32df078879 (patch) | |
| tree | b614f8a1945196089cbe063b4c176e35070c582f | |
| parent | 5e57c2cf83ef62e9887592b46a4c3352662fb988 (diff) | |
| parent | 25ccbb97ffd3298caede635f29445073e845cfc3 (diff) | |
| download | frameworks_base-f87743e7bdfd10b9a1719036a6320a32df078879.zip frameworks_base-f87743e7bdfd10b9a1719036a6320a32df078879.tar.gz frameworks_base-f87743e7bdfd10b9a1719036a6320a32df078879.tar.bz2 | |
Merge "Prevent NullPointerException cases while using SipService."
| -rw-r--r-- | voip/java/android/net/sip/SipManager.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java index dce46fe..cd0b5c4 100644 --- a/voip/java/android/net/sip/SipManager.java +++ b/voip/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); } |