Merge "setActiveTrack and setBufferProvider can't fail"

diff --cc services/audioflinger/AudioMixer.cpp
index f302b2f,74db59e..1ebcd26
--- 1/services/audioflinger/AudioMixer.cpp
--- 2/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@@ -141,33 -136,46 +142,32 @@@ void AudioMixer::deleteTrackName(int na
          track.volumeInc[1] = 0;
          mTrackNames &= ~(1<<name);
      }
 - }
 +}
  
 -status_t AudioMixer::enable(int name)
 +void AudioMixer::enable()
  {
 -    switch (name) {
 -        case MIXING: {
 -            if (mState.tracks[ mActiveTrack ].enabled != 1) {
 -                mState.tracks[ mActiveTrack ].enabled = 1;
 -                ALOGV("enable(%d)", mActiveTrack);
 -                invalidateState(1<<mActiveTrack);
 -            }
 -        } break;
 -        default:
 -            return NAME_NOT_FOUND;
 +    if (mState.tracks[ mActiveTrack ].enabled != 1) {
 +        mState.tracks[ mActiveTrack ].enabled = 1;
 +        ALOGV("enable(%d)", mActiveTrack);
 +        invalidateState(1<<mActiveTrack);
      }
 -    return NO_ERROR;
  }
  
 -status_t AudioMixer::disable(int name)
 +void AudioMixer::disable()
  {
 -    switch (name) {
 -        case MIXING: {
 -            if (mState.tracks[ mActiveTrack ].enabled != 0) {
 -                mState.tracks[ mActiveTrack ].enabled = 0;
 -                ALOGV("disable(%d)", mActiveTrack);
 -                invalidateState(1<<mActiveTrack);
 -            }
 -        } break;
 -        default:
 -            return NAME_NOT_FOUND;
 +    if (mState.tracks[ mActiveTrack ].enabled != 0) {
 +        mState.tracks[ mActiveTrack ].enabled = 0;
 +        ALOGV("disable(%d)", mActiveTrack);
 +        invalidateState(1<<mActiveTrack);
      }
 -    return NO_ERROR;
  }
  
- status_t AudioMixer::setActiveTrack(int track)
+ void AudioMixer::setActiveTrack(int track)
  {
-     if (uint32_t(track-TRACK0) >= MAX_NUM_TRACKS) {
-         return BAD_VALUE;
-     }
-     mActiveTrack = track - TRACK0;
-     return NO_ERROR;
+     // this also catches track < TRACK0
+     track -= TRACK0;
+     assert(uint32_t(track) < MAX_NUM_TRACKS);
+     mActiveTrack = track;
  }
  
  status_t AudioMixer::setParameter(int target, int name, void *value)

diff --cc services/audioflinger/AudioMixer.h
index 02722d7,6f31c5d..f380b35
--- 1/services/audioflinger/AudioMixer.h
--- 2/services/audioflinger/AudioMixer.h
+++ b/services/audioflinger/AudioMixer.h
@@@ -77,13 -78,13 +77,13 @@@ public
      int         getTrackName();
      void        deleteTrackName(int name);
  
 -    status_t    enable(int name);
 -    status_t    disable(int name);
 +    void        enable();
 +    void        disable();
  
-     status_t    setActiveTrack(int track);
+     void        setActiveTrack(int track);
      status_t    setParameter(int target, int name, void *value);
  
-     status_t    setBufferProvider(AudioBufferProvider* bufferProvider);
+     void        setBufferProvider(AudioBufferProvider* bufferProvider);
      void        process();
  
      uint32_t    trackNames() const { return mTrackNames; }