ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wink Saville 2012-08-30 17:31:47 -07:00 committed by Android (Google) Code Review
commit f196b56d70
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/gui/SurfaceComposerClient.h
View File

@ -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,

8
libs/gui/SurfaceComposerClient.cpp
View File

@ -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;