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

Commit f196b56d authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Revert "A vendor ril depends on a native screen shot code."" into jb-mr1-dev

parents ec34af41 94f26155

include/gui/SurfaceComposerClient.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -148,11 +148,6 @@ class ScreenshotClient 
public:

public:

    ScreenshotClient();

    ScreenshotClient();





    // 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 update();



    // frees the previous screenshot and capture a new one

    // frees the previous screenshot and capture a new one

    status_t update(const sp<IBinder>& display);

    status_t update(const sp<IBinder>& display);

    status_t update(const sp<IBinder>& display,

    status_t update(const sp<IBinder>& display,

libs/gui/SurfaceComposerClient.cpp

+0 −8
Original line number Original line Diff line number Diff line
@@ -558,14 +558,6 @@ ScreenshotClient::ScreenshotClient() 
    : mWidth(0), mHeight(0), mFormat(PIXEL_FORMAT_NONE) {

    : mWidth(0), mHeight(0), mFormat(PIXEL_FORMAT_NONE) {

}

}





// 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 ScreenshotClient::update() {

    sp<ISurfaceComposer> sm(ComposerService::getComposerService());

    return update(sm->getBuiltInDisplay(0));

}



status_t ScreenshotClient::update(const sp<IBinder>& display) {

status_t ScreenshotClient::update(const sp<IBinder>& display) {

    sp<ISurfaceComposer> s(ComposerService::getComposerService());

    sp<ISurfaceComposer> s(ComposerService::getComposerService());

    if (s == NULL) return NO_INIT;

    if (s == NULL) return NO_INIT;