am 5ac5cd73: am 9d5b7aca: Merge change Ic0e3ddf8 into eclair-mr2

Merge commit '5ac5cd7300fda7cb80ae0fb3d66594abd4f91939'

* commit '5ac5cd7300fda7cb80ae0fb3d66594abd4f91939':
  Remove unused Java object reference in native SoundPool code.

3 files changed, 3 insertions, 4 deletions

diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp
index b17e31b2266a..4d2e0486862c 100644
--- a/media/jni/soundpool/SoundPool.cpp
+++ b/media/jni/soundpool/SoundPool.cpp
@@ -38,7 +38,7 @@ uint32_t kMaxSampleRate = 48000;
 uint32_t kDefaultSampleRate = 44100;
 uint32_t kDefaultFrameCount = 1200;
 
-SoundPool::SoundPool(jobject soundPoolRef, int maxChannels, int streamType, int srcQuality)
+SoundPool::SoundPool(int maxChannels, int streamType, int srcQuality)
 {
     LOGV("SoundPool constructor: maxChannels=%d, streamType=%d, srcQuality=%d",
             maxChannels, streamType, srcQuality);
@@ -54,7 +54,6 @@ SoundPool::SoundPool(jobject soundPoolRef, int maxChannels, int streamType, int
     LOGW_IF(maxChannels != mMaxChannels, "App requested %d channels", maxChannels);
 
     mQuit = false;
-    mSoundPoolRef = soundPoolRef;
     mDecodeThread = 0;
     mStreamType = streamType;
     mSrcQuality = srcQuality;
diff --git a/media/jni/soundpool/SoundPool.h b/media/jni/soundpool/SoundPool.h
index ab86e90ef3a7..e0ead9a18a7a 100644
--- a/media/jni/soundpool/SoundPool.h
+++ b/media/jni/soundpool/SoundPool.h
@@ -159,7 +159,7 @@ class SoundPool {
     friend class SoundPoolThread;
     friend class SoundChannel;
 public:
-    SoundPool(jobject soundPoolRef, int maxChannels, int streamType, int srcQuality);
+    SoundPool(int maxChannels, int streamType, int srcQuality);
     ~SoundPool();
     int load(const char* url, int priority);
     int load(int fd, int64_t offset, int64_t length, int priority);
diff --git a/media/jni/soundpool/android_media_SoundPool.cpp b/media/jni/soundpool/android_media_SoundPool.cpp
index 0ce2d6f5ecc6..1381db328acb 100644
--- a/media/jni/soundpool/android_media_SoundPool.cpp
+++ b/media/jni/soundpool/android_media_SoundPool.cpp
@@ -154,7 +154,7 @@ android_media_SoundPool_native_setup(JNIEnv *env, jobject thiz,
         jobject weak_this, jint maxChannels, jint streamType, jint srcQuality)
 {
     LOGV("android_media_SoundPool_native_setup");
-    SoundPool *ap = new SoundPool(weak_this, maxChannels, streamType, srcQuality);
+    SoundPool *ap = new SoundPool(maxChannels, streamType, srcQuality);
     if (ap == NULL) {
         jniThrowException(env, "java/lang/RuntimeException", "Out of memory");
         return;