summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/include/TimedEventQueue.h
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2013-12-10 17:20:46 -0800
committerEric Laurent <elaurent@google.com>2013-12-10 17:20:46 -0800
commit2acc8b3833c7bdeca13f1f1a68d212d0cd5d750f (patch)
treecc0200c020cf392ddaa8f3f78f72664ff1e68d77 /media/libstagefright/include/TimedEventQueue.h
parent35a9e7d49ff5ff99fedb0bf2a35c39f7ea5a2f9e (diff)
downloadframeworks_av-2acc8b3833c7bdeca13f1f1a68d212d0cd5d750f.zip
frameworks_av-2acc8b3833c7bdeca13f1f1a68d212d0cd5d750f.tar.gz
frameworks_av-2acc8b3833c7bdeca13f1f1a68d212d0cd5d750f.tar.bz2
Revert "stagefright: fix TimedEventQueue wakelock"
This reverts commit aef04853de0ce27222cf6250b2ba4fa9fc6a72a8.
Diffstat (limited to 'media/libstagefright/include/TimedEventQueue.h')
-rw-r--r--media/libstagefright/include/TimedEventQueue.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/media/libstagefright/include/TimedEventQueue.h b/media/libstagefright/include/TimedEventQueue.h
index 4e8912d..38a08b1 100644
--- a/media/libstagefright/include/TimedEventQueue.h
+++ b/media/libstagefright/include/TimedEventQueue.h
@@ -33,7 +33,7 @@ struct TimedEventQueue {
struct Event : public RefBase {
Event()
- : mEventID(0), mHasWakeLock(false) {
+ : mEventID(0) {
}
virtual ~Event() {}
@@ -42,14 +42,6 @@ struct TimedEventQueue {
return mEventID;
}
- void setWakeLock() {
- mHasWakeLock = true;
- }
-
- bool hasWakeLock() {
- return mHasWakeLock;
- }
-
protected:
virtual void fire(TimedEventQueue *queue, int64_t now_us) = 0;
@@ -57,7 +49,6 @@ struct TimedEventQueue {
friend class TimedEventQueue;
event_id mEventID;
- bool mHasWakeLock;
void setEventID(event_id id) {
mEventID = id;
@@ -127,6 +118,7 @@ private:
struct QueueItem {
sp<Event> event;
int64_t realtime_us;
+ bool has_wakelock;
};
struct StopEvent : public TimedEventQueue::Event {