Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4104284 authored by Andy McFadden's avatar Andy McFadden Committed by Android Git Automerger
Browse files

am ae2cfb57: Minor tweaks 

* commit 'ae2cfb57':
  Minor tweaks
parents 65a835df ae2cfb57

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

services/surfaceflinger/EventThread.cpp

+0 −5
Original line number Diff line number Diff line
@@ -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",

services/surfaceflinger/EventThread.h

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ public: 


private:

    virtual bool        threadLoop();

    virtual status_t    readyToRun();

    virtual void        onFirstRef();



    void removeDisplayEventConnection(const wp<Connection>& connection);