summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/Threads.h
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2013-10-04 11:08:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 11:08:26 -0700
commit5918e0cb64200f64632595f7aea6062c65d43353 (patch)
tree510acab52ad88f9772fd072235993a01f8332023 /services/audioflinger/Threads.h
parent02627597fc4951e16b9002601e4cf3b1cc234c4b (diff)
parentb5677882cf9a34bd3f2daf76d10951282ea9b083 (diff)
downloadframeworks_av-5918e0cb64200f64632595f7aea6062c65d43353.zip
frameworks_av-5918e0cb64200f64632595f7aea6062c65d43353.tar.gz
frameworks_av-5918e0cb64200f64632595f7aea6062c65d43353.tar.bz2
am b5677882: am 8097068d: Merge "Better recording wake lock accounting" into klp-dev
* commit 'b5677882cf9a34bd3f2daf76d10951282ea9b083': Better recording wake lock accounting
Diffstat (limited to 'services/audioflinger/Threads.h')
-rw-r--r--services/audioflinger/Threads.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h
index 92e845b..906846f 100644
--- a/services/audioflinger/Threads.h
+++ b/services/audioflinger/Threads.h
@@ -240,8 +240,8 @@ protected:
effect_uuid_t mType; // effect type UUID
};
- void acquireWakeLock();
- void acquireWakeLock_l();
+ void acquireWakeLock(int uid = -1);
+ void acquireWakeLock_l(int uid = -1);
void releaseWakeLock();
void releaseWakeLock_l();
void setEffectSuspended_l(const effect_uuid_t *type,
@@ -952,4 +952,5 @@ private:
// For dumpsys
const sp<NBAIO_Sink> mTeeSink;
+ int mClientUid;
};