am e1d2715: am f87743e: Merge "Prevent NullPointerException cases while using SipService."

* commit 'e1d271546767a8e2213aabba92506af9e97020b4':
  Prevent NullPointerException cases while using SipService.

Author: cco3

voip/java/android/net/sip/SipManager.java

@@ -471,6 +471,10 @@ public void register(SipProfile localProfile, int expiryTime,
         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 void unregister(SipProfile localProfile,
         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 SipSession getSessionFor(Intent incomingCallIntent)
         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);
         }