diff options
| author | 2012-09-12 16:59:59 -0700 | |
|---|---|---|
| committer | 2012-09-13 11:21:40 -0700 | |
| commit | ae2cfb5746e87f1bf17c446e20274c41ce0a57ce (patch) | |
| tree | 83601a18669c0fb2c1b30172f02fa9822dda9664 | |
| parent | a4383fd9de407d16342cd1069f75d2f0207efc0f (diff) | |
Minor tweaks
A couple of minor cleanups I stumbled over while looking at other
things.
Change-Id: I385ecfe1afefd577afbc59d7ef1d98d868073651
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 4 | ||||
| -rw-r--r-- | services/surfaceflinger/EventThread.cpp | 5 | ||||
| -rw-r--r-- | services/surfaceflinger/EventThread.h | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 2e4384e75b..1b55792fcf 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -188,7 +188,7 @@ HWComposer::HWComposer( HWComposer::~HWComposer() { if (mHwc) { - mHwc->eventControl(mHwc, 0, EVENT_VSYNC, 0); + mHwc->eventControl(mHwc, HWC_DISPLAY_PRIMARY, HWC_EVENT_VSYNC, 0); } if (mVSyncThread != NULL) { mVSyncThread->requestExitAndWait(); @@ -540,7 +540,7 @@ status_t HWComposer::commit() { status_t HWComposer::release() const { if (mHwc) { - mHwc->eventControl(mHwc, 0, HWC_EVENT_VSYNC, 0); + mHwc->eventControl(mHwc, HWC_DISPLAY_PRIMARY, HWC_EVENT_VSYNC, 0); return (status_t)mHwc->blank(mHwc, 0, 1); } return NO_ERROR; diff --git a/services/surfaceflinger/EventThread.cpp b/services/surfaceflinger/EventThread.cpp index ade9f751f0..19e711eb05 100644 --- a/services/surfaceflinger/EventThread.cpp +++ b/services/surfaceflinger/EventThread.cpp @@ -265,11 +265,6 @@ void EventThread::disableVSyncLocked() { mDebugVsyncEnabled = false; } -status_t EventThread::readyToRun() { - ALOGI("EventThread ready to run."); - return NO_ERROR; -} - void EventThread::dump(String8& result, char* buffer, size_t SIZE) const { Mutex::Autolock _l(mLock); result.appendFormat("VSYNC state: %s\n", diff --git a/services/surfaceflinger/EventThread.h b/services/surfaceflinger/EventThread.h index c8bb312cde..a92ba5c19d 100644 --- a/services/surfaceflinger/EventThread.h +++ b/services/surfaceflinger/EventThread.h @@ -85,7 +85,6 @@ public: private: virtual bool threadLoop(); - virtual status_t readyToRun(); virtual void onFirstRef(); void removeDisplayEventConnection(const wp<Connection>& connection); |