Merge "Prevent NullPointerException cases while using SipService." (f87743e7) · Commits · e / os / android_frameworks_base

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}