Merge "Move declaration of mixerStatus to inner block"

diff --cc services/audioflinger/AudioFlinger.cpp
index d522091,7627dab..a3689d4
--- 1/services/audioflinger/AudioFlinger.cpp
--- 2/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@@ -2014,10 -1958,36 +2013,10 @@@ bool AudioFlinger::MixerThread::threadL
  
      while (!exitPending())
      {
 -#ifdef DEBUG_CPU_USAGE
 -        cpu.sampleAndEnable();
 -        unsigned n = stats.n();
 -        // cpu.elapsed() is expensive, so don't call it every loop
 -        if ((n & 127) == 1) {
 -            long long elapsed = cpu.elapsed();
 -            if (elapsed >= DEBUG_CPU_USAGE * 1000000000LL) {
 -                double perLoop = elapsed / (double) n;
 -                double perLoop100 = perLoop * 0.01;
 -                double mean = stats.mean();
 -                double stddev = stats.stddev();
 -                double minimum = stats.minimum();
 -                double maximum = stats.maximum();
 -                cpu.resetStatistics();
 -                ALOGI("CPU usage over past %.1f secs (%u mixer loops at %.1f mean ms per loop):\n  us per mix loop: mean=%.0f stddev=%.0f min=%.0f max=%.0f\n  %% of wall: mean=%.1f stddev=%.1f min=%.1f max=%.1f",
 -                        elapsed * .000000001, n, perLoop * .000001,
 -                        mean * .001,
 -                        stddev * .001,
 -                        minimum * .001,
 -                        maximum * .001,
 -                        mean / perLoop100,
 -                        stddev / perLoop100,
 -                        minimum / perLoop100,
 -                        maximum / perLoop100);
 -            }
 -        }
 -#endif
 +        cpuStats.sample();
          processConfigEvents();
  
-         mixerStatus = MIXER_IDLE;
+         mixer_state mixerStatus = MIXER_IDLE;
          { // scope for mLock
  
              Mutex::Autolock _l(mLock);