am b5677882: am 8097068d: Merge "Better recording wake lock accounting" into klp-dev

* commit 'b5677882cf9a34bd3f2daf76d10951282ea9b083':
  Better recording wake lock accounting

diff --cc services/audioflinger/Threads.cpp
index 9716eb3,8aae892..6ae0540
--- 1/services/audioflinger/Threads.cpp
--- 2/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@@ -4354,52 -4349,33 +4363,52 @@@ bool AudioFlinger::RecordThread::thread
                  // go to sleep
                  mWaitWorkCV.wait(mLock);
                  ALOGV("RecordThread: loop starting");
-                 acquireWakeLock_l();
+                 acquireWakeLock_l(mClientUid);
                  continue;
              }
 -            if (mActiveTrack != 0) {
 -                if (mActiveTrack->isTerminated()) {
 -                    removeTrack_l(mActiveTrack);
 -                    mActiveTrack.clear();
 -                } else if (mActiveTrack->mState == TrackBase::PAUSING) {
 -                    standby();
 +
 +            if (activeTrack->isTerminated()) {
 +                removeTrack_l(activeTrack);
 +                mActiveTrack.clear();
 +                continue;
 +            }
 +
 +            activeTrackState = activeTrack->mState;
 +            switch (activeTrackState) {
 +            case TrackBase::PAUSING:
 +                standby();
 +                mActiveTrack.clear();
 +                mStartStopCond.broadcast();
 +                doSleep = true;
 +                continue;
 +
 +            case TrackBase::RESUMING:
 +                mStandby = false;
 +                if (mReqChannelCount != activeTrack->channelCount()) {
                      mActiveTrack.clear();
                      mStartStopCond.broadcast();
 -                } else if (mActiveTrack->mState == TrackBase::RESUMING) {
 -                    if (mReqChannelCount != mActiveTrack->channelCount()) {
 +                    continue;
 +                }
 +                if (readOnce) {
 +                    mStartStopCond.broadcast();
 +                    // record start succeeds only if first read from audio input succeeds
 +                    if (mBytesRead < 0) {
                          mActiveTrack.clear();
 -                        mStartStopCond.broadcast();
 -                    } else if (readOnce) {
 -                        // record start succeeds only if first read from audio input
 -                        // succeeds
 -                        if (mBytesRead >= 0) {
 -                            mActiveTrack->mState = TrackBase::ACTIVE;
 -                        } else {
 -                            mActiveTrack.clear();
 -                        }
 -                        mStartStopCond.broadcast();
 +                        continue;
                      }
 -                    mStandby = false;
 +                    activeTrack->mState = TrackBase::ACTIVE;
                  }
 +                break;
 +
 +            case TrackBase::ACTIVE:
 +                break;
 +
 +            case TrackBase::IDLE:
 +                doSleep = true;
 +                continue;
 +
 +            default:
 +                LOG_FATAL("Unexpected activeTrackState %d", activeTrackState);
              }
  
              lockEffectChains_l(effectChains);

diff --cc services/audioflinger/Threads.h
Simple merge