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

Commit 1b51513f authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Steve Kondik
Browse files

Unbreak libgui 

Change I2c0f05d1f70b96ad801971f23f6f9cf4e0fa7167 broke libgui for a
bunch of pre-4.1 blobs by changing the surfaceclient API, so bring
it back

Change-Id: I1f6ce3b886539d0e972bbe41116192bf162be968
parent e7f8df47

include/gui/SurfaceComposerClient.h

+3 −3
Original line number Diff line number Diff line
@@ -73,10 +73,10 @@ public: 


    /* triggers screen on and waits for it to complete */

    static void unblankDisplay(const sp<IBinder>& display);



#if defined(TOROPLUS_RADIO)

    // TODO: Remove me.  Do not use.

    // This is a compatibility shim for one product whose drivers are depending on

    // this legacy function (when they shouldn't).

    static status_t getDisplayInfo(int32_t displayId, DisplayInfo* info);

#endif



#if defined(ICS_CAMERA_BLOB) || defined(MR0_CAMERA_BLOB)

    static ssize_t getDisplayWidth(int32_t displayId);

libs/gui/SurfaceComposerClient.cpp

+3 −2
Original line number Diff line number Diff line
@@ -655,13 +655,14 @@ void SurfaceComposerClient::unblankDisplay(const sp<IBinder>& token) { 
    ComposerService::getComposerService()->unblank(token);

}



#if defined(TOROPLUS_RADIO)

// TODO: Remove me.  Do not use.

// This is a compatibility shim for one product whose drivers are depending on

// this legacy function (when they shouldn't).

status_t SurfaceComposerClient::getDisplayInfo(

        int32_t displayId, DisplayInfo* info)

{

    return getDisplayInfo(getBuiltInDisplay(displayId), info);

}

#endif



#if defined(ICS_CAMERA_BLOB) || defined(MR0_CAMERA_BLOB)

ssize_t SurfaceComposerClient::getDisplayWidth(int32_t displayId) {