am 62679112: Merge change I3c256cf3 into eclair-mr2

Merge commit '62679112a2ac98f6b73e9a5f6e92b3cb5728703c' into eclair-mr2-plus-aosp

* commit '62679112a2ac98f6b73e9a5f6e92b3cb5728703c':
  More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.

media/jni/soundpool/SoundPool.h

@@ -186,9 +186,6 @@ private:
     SoundPool() {} // no default constructor
     bool startThreads();
     void doLoad(sp<Sample>& sample);
-    inline void notify(const SoundPoolEvent* event) {
-        android_soundpool_SoundPool_notify(mSoundPoolRef, event);
-    }
     sp<Sample> findSample(int sampleID) { return mSamples.valueFor(sampleID); }
     SoundChannel* findChannel (int channelID);
     SoundChannel* findNextChannel (int channelID);
@@ -202,7 +199,6 @@ private:
     int run();
     void quit();
 
-    jobject                 mSoundPoolRef;
     Mutex                   mLock;
     Mutex                   mRestartLock;
     Condition               mCondition;