Merge "Revert "A vendor ril depends on a native screen shot code."" into jb-mr1-dev
This commit is contained in:
commit
f196b56d70
@ -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<IBinder>& display);
|
||||
status_t update(const sp<IBinder>& display,
|
||||
|
@ -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<ISurfaceComposer> sm(ComposerService::getComposerService());
|
||||
return update(sm->getBuiltInDisplay(0));
|
||||
}
|
||||
|
||||
status_t ScreenshotClient::update(const sp<IBinder>& display) {
|
||||
sp<ISurfaceComposer> s(ComposerService::getComposerService());
|
||||
if (s == NULL) return NO_INIT;
|
||||
|
Loading…
Reference in New Issue
Block a user