From 93e471f620454f7de73d190521568b1e25879767 Mon Sep 17 00:00:00 2001
From: Glenn Kasten <gkasten@google.com>
Date: Mon, 19 Aug 2013 08:40:07 -0700
Subject: Rename standby methods

ThreadBase::standby() returns the value of mStandby.

RecordThread::standby() "overrode" ThreadBase::standby(), but with a
different meaning and no return value.  This meant you couldn't
access the parent's class definition within RecordThread.

This could be confusing, so this CL renames RecordThread::standby()
to standbyIfNotAlreadyInStandby().

Change-Id: I9196ee12701dd2dccdfaed922af2d7b8e8774676
---
 services/audioflinger/Threads.cpp | 8 ++++----
 services/audioflinger/Threads.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'services')

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index ef90952..59afee8 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -4445,7 +4445,7 @@ bool AudioFlinger::RecordThread::threadLoop()
             // make a stable copy of mActiveTrack
             activeTrack = mActiveTrack;
             if (activeTrack == 0) {
-                standby();
+                standbyIfNotAlreadyInStandby();
                 // exitPending() can't become true here
                 releaseWakeLock_l();
                 ALOGV("RecordThread: loop stopping");
@@ -4465,7 +4465,7 @@ bool AudioFlinger::RecordThread::threadLoop()
             activeTrackState = activeTrack->mState;
             switch (activeTrackState) {
             case TrackBase::PAUSING:
-                standby();
+                standbyIfNotAlreadyInStandby();
                 mActiveTrack.clear();
                 mStartStopCond.broadcast();
                 doSleep = true;
@@ -4642,7 +4642,7 @@ bool AudioFlinger::RecordThread::threadLoop()
         // effectChains doesn't need to be cleared, since it is cleared by destructor at scope end
     }
 
-    standby();
+    standbyIfNotAlreadyInStandby();
 
     {
         Mutex::Autolock _l(mLock);
@@ -4660,7 +4660,7 @@ bool AudioFlinger::RecordThread::threadLoop()
     return false;
 }
 
-void AudioFlinger::RecordThread::standby()
+void AudioFlinger::RecordThread::standbyIfNotAlreadyInStandby()
 {
     if (!mStandby) {
         inputStandBy();
diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h
index 8a859f5..cbc3827 100644
--- a/services/audioflinger/Threads.h
+++ b/services/audioflinger/Threads.h
@@ -931,7 +931,7 @@ private:
             void    clearSyncStartEvent();
 
             // Enter standby if not already in standby, and set mStandby flag
-            void    standby();
+            void    standbyIfNotAlreadyInStandby();
 
             // Call the HAL standby method unconditionally, and don't change mStandby flag
             void    inputStandBy();
-- 
cgit v1.1