From 94f261556cc5f4aa628cd5b71bf923b583f6e3c3 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Thu, 30 Aug 2012 11:53:55 -0700 Subject: [PATCH] Revert "A vendor ril depends on a native screen shot code." This reverts commit 9b5782baf0a8a2d7afc7129453beb5df7abe7650. A new ril for toro, hack no longer needed. --- include/gui/SurfaceComposerClient.h | 5 ----- libs/gui/SurfaceComposerClient.cpp | 8 -------- 2 files changed, 13 deletions(-) diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h index 73214a415..a143d812e 100644 --- a/include/gui/SurfaceComposerClient.h +++ b/include/gui/SurfaceComposerClient.h @@ -148,11 +148,6 @@ class ScreenshotClient public: 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 status_t update(const sp& display); status_t update(const sp& display, diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 0ffa93253..e4922a440 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -558,14 +558,6 @@ ScreenshotClient::ScreenshotClient() : 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 sm(ComposerService::getComposerService()); - return update(sm->getBuiltInDisplay(0)); -} - status_t ScreenshotClient::update(const sp& display) { sp s(ComposerService::getComposerService()); if (s == NULL) return NO_INIT;