diff options
| author | Eric Laurent <elaurent@google.com> | 2013-11-10 16:25:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-10 16:25:19 -0800 |
| commit | 5b5f76dcb29792830baca1f25e51a732b80241df (patch) | |
| tree | 9d5d9b02aa8ca89867021afa459ed1b65ce4ec8f /media/libstagefright/include | |
| parent | 86f79f2332efad4862a4dd56f9552c93bbb52bcf (diff) | |
| parent | a72911563b0e5b21b196d40249b53975bf8d8f85 (diff) | |
| download | frameworks_av-5b5f76dcb29792830baca1f25e51a732b80241df.zip frameworks_av-5b5f76dcb29792830baca1f25e51a732b80241df.tar.gz frameworks_av-5b5f76dcb29792830baca1f25e51a732b80241df.tar.bz2 | |
am a7291156: Merge "TimedEventQueue: improve wakelock management" into klp-dev
* commit 'a72911563b0e5b21b196d40249b53975bf8d8f85':
TimedEventQueue: improve wakelock management
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/TimedEventQueue.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/include/TimedEventQueue.h b/media/libstagefright/include/TimedEventQueue.h index 4e49c83..38a08b1 100644 --- a/media/libstagefright/include/TimedEventQueue.h +++ b/media/libstagefright/include/TimedEventQueue.h @@ -118,6 +118,7 @@ private: struct QueueItem { sp<Event> event; int64_t realtime_us; + bool has_wakelock; }; struct StopEvent : public TimedEventQueue::Event { @@ -139,6 +140,7 @@ private: sp<IPowerManager> mPowerManager; sp<IBinder> mWakeLockToken; const sp<PMDeathRecipient> mDeathRecipient; + uint32_t mWakeLockCount; static void *ThreadWrapper(void *me); void threadEntry(); @@ -146,7 +148,7 @@ private: sp<Event> removeEventFromQueue_l(event_id id); void acquireWakeLock_l(); - void releaseWakeLock_l(); + void releaseWakeLock_l(bool force = false); TimedEventQueue(const TimedEventQueue &); TimedEventQueue &operator=(const TimedEventQueue &); |