summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-03-06 11:24:48 -0800
committerGlenn Kasten <gkasten@google.com>2012-03-06 12:46:21 -0800
commit2bad67f3e33f74bdd3a8265e9a00a38e4d43e005 (patch)
tree1186e7790197e105936e38c6ea4052068f4161b4 /services/audioflinger/AudioFlinger.h
parent66199cf939efbffb9154df89f85d0d30c8d3ec55 (diff)
downloadframeworks_base-2bad67f3e33f74bdd3a8265e9a00a38e4d43e005.zip
frameworks_base-2bad67f3e33f74bdd3a8265e9a00a38e4d43e005.tar.gz
frameworks_base-2bad67f3e33f74bdd3a8265e9a00a38e4d43e005.tar.bz2
Rename updateWaitTime since a lock is held
Change-Id: I9bb978cbd0debf5b21676467060f72eebafea3e6
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
-rw-r--r--services/audioflinger/AudioFlinger.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index c7ac0a8..28b33a2 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -812,7 +812,7 @@ protected:
virtual void threadLoop_standby();
// Non-trivial for DUPLICATING only
- virtual void updateWaitTime() { }
+ virtual void updateWaitTime_l() { }
// Non-trivial for DIRECT only
virtual void applyVolume() { }
@@ -1046,7 +1046,9 @@ public:
virtual void threadLoop_sleepTime();
virtual void threadLoop_write();
virtual void threadLoop_standby();
- virtual void updateWaitTime();
+
+ // called from threadLoop, addOutputTrack, removeOutputTrack
+ virtual void updateWaitTime_l();
private:
uint32_t mWaitTimeMs;