am 38dc67f4: am 25b52a2f: SIP: remove dependency on javax.sip.SipException. (e7659948) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/sip/SipCallBase.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.net.sip.SipManager;
		import java.util.ArrayList;
		import java.util.Iterator;
		import java.util.List;
		import javax.sip.SipException;

		abstract class SipCallBase extends Call {
		private static final int MAX_CONNECTIONS_PER_CALL = 5;

+1 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.net.rtp.AudioGroup;
		import android.net.rtp.AudioStream;
		import android.net.sip.SipAudioCall;
		import android.net.sip.SipErrorCode;
		import android.net.sip.SipException;
		import android.net.sip.SipManager;
		import android.net.sip.SipProfile;
		import android.net.sip.SipSessionState;
		@@ -66,8 +67,6 @@ import java.text.ParseException;
		import java.util.ArrayList;
		import java.util.List;

		import javax.sip.SipException;

		/**
		* {@hide}
		*/

+0 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,6 @@ import android.net.rtp.AudioGroup;
		import android.net.rtp.AudioStream;
		import android.os.Message;

		import javax.sip.SipException;

		/**
		* Interface for making audio calls over SIP.
		* @hide

+0 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import java.util.HashMap;
		import java.util.List;
		import java.util.Map;
		import javax.sdp.SdpException;
		import javax.sip.SipException;

		/**
		* Class that handles an audio call over SIP.

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.net.sip;

		/**
		* @hide
		*/
		public class SipException extends Exception {
		public SipException() {
		}

		public SipException(String message) {
		super(message);
		}

		public SipException(String message, Throwable cause) {
		// we want to eliminate the dependency on javax.sip.SipException
		super(message, ((cause instanceof javax.sip.SipException)
		&& (cause.getCause() != null))
		? cause.getCause()
		: cause);
		}
		}