commit 17745436aa6d76765791f3c877360399b6a95487
author Elliott Hughes <enh@google.com> Fri Nov 30 12:56:01 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 30 12:56:01 2012 -0800
tree 4ed62fdfd2c85af14578bfcc098be84043053eb9
parent 86d1860a1d9c905bf8ee8328bcee4537cd02fcd6
parent fe2164c76a5715e0a8106aacfd78a372d510bc04

am 9813e365: am 940ad4aa: Merge "Make AudioGroup.add locale safe"

* commit '9813e365e55a59348d12e36e08902899c3f05eb0':
  Make AudioGroup.add locale safe

jni/rtp/Android.mk

diff --git a/jni/rtp/Android.mk b/jni/rtp/Android.mk
index 82d7912..b265cdd 100644
--- a/jni/rtp/Android.mk
+++ b/jni/rtp/Android.mk
@@ -37,7 +37,6 @@
 	libcutils \
 	libutils \
 	libmedia \
-	libmedia_native \
 	libstagefright_amrnb_common
 
 LOCAL_STATIC_LIBRARIES := libgsm libstagefright_amrnbdec libstagefright_amrnbenc

jni/rtp/AudioGroup.cpp

diff --git a/jni/rtp/AudioGroup.cpp b/jni/rtp/AudioGroup.cpp
index 1579e6a..2f0829e 100644
--- a/jni/rtp/AudioGroup.cpp
+++ b/jni/rtp/AudioGroup.cpp
@@ -785,8 +785,8 @@
     int deviceSocket = mGroup->mDeviceSocket;
 
     // Find out the frame count for AudioTrack and AudioRecord.
-    int output = 0;
-    int input = 0;
+    size_t output = 0;
+    size_t input = 0;
     if (AudioTrack::getMinFrameCount(&output, AUDIO_STREAM_VOICE_CALL,
         sampleRate) != NO_ERROR || output <= 0 ||
         AudioRecord::getMinFrameCount(&input, sampleRate,