resolved conflicts for merge of 1a4b9939 to master

Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2

diff --cc services/audioflinger/AudioFlinger.cpp
Simple merge

diff --cc services/audioflinger/AudioMixer.cpp
index dc1d1a7,1200f75..d230d27
--- 1/services/audioflinger/AudioMixer.cpp
--- 2/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@@ -329,10 -331,28 +329,27 @@@ void AudioMixer::track_t::adjustVolumeR
      }
  }
  
+ size_t AudioMixer::track_t::getUnreleasedFrames()
+ {
+     if (resampler != NULL) {
+         return resampler->getUnreleasedFrames();
+     }
+     return 0;
+ }
+ 
+ size_t AudioMixer::getUnreleasedFrames(int name)
+ {
+     name -= TRACK0;
+     if (uint32_t(name) < MAX_NUM_TRACKS) {
+         track_t& track(mState.tracks[name]);
+         return track.getUnreleasedFrames();
+     }
+     return 0;
+ }
  
 -status_t AudioMixer::setBufferProvider(AudioBufferProvider* buffer)
 +void AudioMixer::setBufferProvider(AudioBufferProvider* buffer)
  {
      mState.tracks[ mActiveTrack ].bufferProvider = buffer;
 -    return NO_ERROR;
  }
  
  

diff --cc services/audioflinger/AudioMixer.h
index 70464fc,0137185..8ba5073
--- 1/services/audioflinger/AudioMixer.h
--- 2/services/audioflinger/AudioMixer.h
+++ b/services/audioflinger/AudioMixer.h
@@@ -88,6 -89,10 +88,8 @@@ public
  
      uint32_t    trackNames() const { return mTrackNames; }
  
 -    static void ditherAndClamp(int32_t* out, int32_t const *sums, size_t c);
 -
+     size_t      getUnreleasedFrames(int name);
+ 
  private:
  
      enum {