summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.bp4
-rw-r--r--src/java/android/net/rtp/AudioCodec.java3
-rw-r--r--src/java/android/net/rtp/AudioGroup.java3
-rw-r--r--src/java/android/net/rtp/AudioStream.java2
-rw-r--r--src/java/android/net/rtp/RtpStream.java2
-rw-r--r--src/java/android/net/sip/SipAudioCall.java2
-rw-r--r--src/java/android/net/sip/SipErrorCode.java2
-rw-r--r--src/java/android/net/sip/SipException.java2
-rw-r--r--src/java/android/net/sip/SipManager.java2
-rw-r--r--src/java/android/net/sip/SipProfile.java2
-rw-r--r--src/java/android/net/sip/SipRegistrationListener.java2
-rw-r--r--src/java/android/net/sip/SipSession.java2
-rw-r--r--src/jni/rtp/Android.bp8
-rw-r--r--src/jni/rtp/AudioGroup.cpp2
-rw-r--r--src/jni/rtp/GsmCodec.cpp2
15 files changed, 33 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index 7f2d193..5295c5e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
filegroup {
name: "opt-net-voip-srcs",
srcs: [
diff --git a/src/java/android/net/rtp/AudioCodec.java b/src/java/android/net/rtp/AudioCodec.java
index 85255c8..9cae573 100644
--- a/src/java/android/net/rtp/AudioCodec.java
+++ b/src/java/android/net/rtp/AudioCodec.java
@@ -33,6 +33,9 @@ import java.util.Arrays;
* </pre>
*
* @see AudioStream
+ *
+ * @deprecated {@link android.net.sip.SipManager} and associated classes are no longer
+ * supported and should not be used as the basis of future VOIP apps.
*/
public class AudioCodec {
/**
diff --git a/src/java/android/net/rtp/AudioGroup.java b/src/java/android/net/rtp/AudioGroup.java
index 9d96006..fd5992f 100644
--- a/src/java/android/net/rtp/AudioGroup.java
+++ b/src/java/android/net/rtp/AudioGroup.java
@@ -63,6 +63,9 @@ import java.util.Map;
* the AudioGroups is in use.</p>
*
* @see AudioStream
+ *
+ * @deprecated {@link android.net.sip.SipManager} and associated classes are no longer supported and
+ * should not be used as the basis of future VOIP apps.
*/
public class AudioGroup {
/**
diff --git a/src/java/android/net/rtp/AudioStream.java b/src/java/android/net/rtp/AudioStream.java
index 5cd1abc..e746e7d 100644
--- a/src/java/android/net/rtp/AudioStream.java
+++ b/src/java/android/net/rtp/AudioStream.java
@@ -41,6 +41,8 @@ import java.net.SocketException;
*
* @see RtpStream
* @see AudioGroup
+ * @deprecated {@link android.net.sip.SipManager} and associated classes are no longer supported and
+ * should not be used as the basis of future VOIP apps.
*/
public class AudioStream extends RtpStream {
private AudioCodec mCodec;
diff --git a/src/java/android/net/rtp/RtpStream.java b/src/java/android/net/rtp/RtpStream.java
index b9d75cd..ad37455 100644
--- a/src/java/android/net/rtp/RtpStream.java
+++ b/src/java/android/net/rtp/RtpStream.java
@@ -27,6 +27,8 @@ import java.net.SocketException;
*
* <p class="note">Using this class requires
* {@link android.Manifest.permission#INTERNET} permission.</p>
+ * @deprecated {@link android.net.sip.SipManager} and associated classes are no longer supported and
+ * should not be used as the basis of future VOIP apps.
*/
public class RtpStream {
/**
diff --git a/src/java/android/net/sip/SipAudioCall.java b/src/java/android/net/sip/SipAudioCall.java
index 363995c..4d70017 100644
--- a/src/java/android/net/sip/SipAudioCall.java
+++ b/src/java/android/net/sip/SipAudioCall.java
@@ -56,6 +56,8 @@ import java.net.UnknownHostException;
* <a href="{@docRoot}guide/topics/network/sip.html">Session Initiation Protocol</a>
* developer guide.</p>
* </div>
+ * @deprecated {@link android.net.sip.SipManager} and associated classes are no longer supported and
+ * should not be used as the basis of future VOIP apps.
*/
public class SipAudioCall {
private static final String LOG_TAG = SipAudioCall.class.getSimpleName();
diff --git a/src/java/android/net/sip/SipErrorCode.java b/src/java/android/net/sip/SipErrorCode.java
index 509728f..e3f54eb 100644
--- a/src/java/android/net/sip/SipErrorCode.java
+++ b/src/java/android/net/sip/SipErrorCode.java
@@ -22,6 +22,8 @@ package android.net.sip;
* {@link SipSession.Listener#onError onError()},
* {@link SipSession.Listener#onCallChangeFailed onCallChangeFailed()} and
* {@link SipSession.Listener#onRegistrationFailed onRegistrationFailed()}.
+ * @deprecated {@link android.net.sip.SipManager} and associated classes are no longer supported and
+ * should not be used as the basis of future VOIP apps.
*/
public class SipErrorCode {
/** Not an error. */
diff --git a/src/java/android/net/sip/SipException.java b/src/java/android/net/sip/SipException.java
index 0339395..b9cdb12 100644
--- a/src/java/android/net/sip/SipException.java
+++ b/src/java/android/net/sip/SipException.java
@@ -18,6 +18,8 @@ package android.net.sip;
/**
* Indicates a general SIP-related exception.
+ * @deprecated {@link android.net.sip.SipManager} and associated classes are no longer supported and
+ * should not be used as the basis of future VOIP apps.
*/
public class SipException extends Exception {
public SipException() {
diff --git a/src/java/android/net/sip/SipManager.java b/src/java/android/net/sip/SipManager.java
index 39f66de..b74b07d 100644
--- a/src/java/android/net/sip/SipManager.java
+++ b/src/java/android/net/sip/SipManager.java
@@ -63,6 +63,8 @@ import java.util.List;
* <a href="{@docRoot}guide/topics/network/sip.html">Session Initiation Protocol</a>
* developer guide.</p>
* </div>
+ * @deprecated {@link android.net.sip.SipManager} and associated classes are no longer supported and
+ * should not be used as the basis of future VOIP apps.
*/
public class SipManager {
/**
diff --git a/src/java/android/net/sip/SipProfile.java b/src/java/android/net/sip/SipProfile.java
index 14b0334..6f22e47 100644
--- a/src/java/android/net/sip/SipProfile.java
+++ b/src/java/android/net/sip/SipProfile.java
@@ -45,6 +45,8 @@ import javax.sip.address.URI;
* <a href="{@docRoot}guide/topics/network/sip.html">Session Initiation Protocol</a>
* developer guide.</p>
* </div>
+ * @deprecated {@link android.net.sip.SipManager} and associated classes are no longer supported and
+ * should not be used as the basis of future VOIP apps.
*/
public class SipProfile implements Parcelable, Serializable, Cloneable {
private static final long serialVersionUID = 1L;
diff --git a/src/java/android/net/sip/SipRegistrationListener.java b/src/java/android/net/sip/SipRegistrationListener.java
index 9968cc7..0175e8a 100644
--- a/src/java/android/net/sip/SipRegistrationListener.java
+++ b/src/java/android/net/sip/SipRegistrationListener.java
@@ -18,6 +18,8 @@ package android.net.sip;
/**
* Listener for SIP registration events.
+ * @deprecated {@link android.net.sip.SipManager} and associated classes are no longer supported and
+ * should not be used as the basis of future VOIP apps.
*/
public interface SipRegistrationListener {
/**
diff --git a/src/java/android/net/sip/SipSession.java b/src/java/android/net/sip/SipSession.java
index edbc66f..764871c 100644
--- a/src/java/android/net/sip/SipSession.java
+++ b/src/java/android/net/sip/SipSession.java
@@ -25,6 +25,8 @@ import android.telephony.Rlog;
* <p>You can get a {@link SipSession} from {@link SipManager} with {@link
* SipManager#createSipSession createSipSession()} (when initiating calls) or {@link
* SipManager#getSessionFor getSessionFor()} (when receiving calls).</p>
+ * @deprecated {@link android.net.sip.SipManager} and associated classes are no longer supported and
+ * should not be used as the basis of future VOIP apps.
*/
public final class SipSession {
private static final String TAG = "SipSession";
diff --git a/src/jni/rtp/Android.bp b/src/jni/rtp/Android.bp
index b6c8588..a1497f9 100644
--- a/src/jni/rtp/Android.bp
+++ b/src/jni/rtp/Android.bp
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
cc_library_shared {
name: "librtp_jni",
srcs: [
@@ -45,10 +49,6 @@ cc_library_shared {
"libstagefright_amrnbdec",
"libstagefright_amrnbenc",
],
- include_dirs: [
- "frameworks/av/media/libstagefright/codecs/amrnb/enc/src",
- "frameworks/av/media/libstagefright/codecs/amrnb/dec/src",
- ],
cflags: [
"-fvisibility=hidden",
"-Wall",
diff --git a/src/jni/rtp/AudioGroup.cpp b/src/jni/rtp/AudioGroup.cpp
index 5f9cae8..9efd11a 100644
--- a/src/jni/rtp/AudioGroup.cpp
+++ b/src/jni/rtp/AudioGroup.cpp
@@ -1078,7 +1078,7 @@ JNINativeMethod gMethods[] = {
int registerAudioGroup(JNIEnv *env)
{
- gRandom = open("/dev/urandom", O_RDONLY);
+ gRandom = open("/dev/urandom", O_RDONLY | O_CLOEXEC);
if (gRandom == -1) {
ALOGE("urandom: %s", strerror(errno));
return -1;
diff --git a/src/jni/rtp/GsmCodec.cpp b/src/jni/rtp/GsmCodec.cpp
index 4a04bfa..ff1acec 100644
--- a/src/jni/rtp/GsmCodec.cpp
+++ b/src/jni/rtp/GsmCodec.cpp
@@ -16,9 +16,7 @@
#include "AudioCodec.h"
-extern "C" {
#include "gsm.h"
-}
namespace {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 02:13:37 +0000