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

Commit f8e2430b authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Surfaceflinger backward compatibility with old kernels" into ics

parents e352795c 859a3442

services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp

+14 −4
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ 
// ----------------------------------------------------------------------------

namespace android {



static char const * const kSleepFileName = "/sys/power/wait_for_fb_sleep";

static char const * const kWakeFileName  = "/sys/power/wait_for_fb_wake";

static char const * kSleepFileName = "/sys/power/wait_for_fb_sleep";

static char const * kWakeFileName  = "/sys/power/wait_for_fb_wake";

static char const * const kOldSleepFileName = "/sys/android_power/wait_for_fb_sleep";

static char const * const kOldWakeFileName = "/sys/android_power/wait_for_fb_wake";



// ----------------------------------------------------------------------------
@@ -109,13 +111,21 @@ status_t DisplayHardwareBase::DisplayEventThread::releaseScreen() const 


status_t DisplayHardwareBase::DisplayEventThread::readyToRun()

{

    if (access(kSleepFileName, R_OK) || access(kWakeFileName, R_OK)) {

        if (access(kOldSleepFileName, R_OK) || access(kOldWakeFileName, R_OK)) {

            LOGE("Couldn't open %s or %s", kSleepFileName, kWakeFileName);

            return NO_INIT;

        }

        kSleepFileName = kOldSleepFileName;

        kWakeFileName = kOldWakeFileName;

    }

    return NO_ERROR;

}



status_t DisplayHardwareBase::DisplayEventThread::initCheck() const

{

    return ((access(kSleepFileName, R_OK) == 0 &&

            access(kWakeFileName, R_OK) == 0)) ? NO_ERROR : NO_INIT;

    return (access(kSleepFileName, R_OK) == 0 && access(kWakeFileName, R_OK) == 0) ||

           (access(kOldSleepFileName, R_OK) == 0 && access(kOldWakeFileName, R_OK) == 0) ? NO_ERROR : NO_INIT;

}



// ----------------------------------------------------------------------------