Merge "initial checkin of a preliminary HDCP API for vendors to implement." into jb-mr1-dev
diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h
index a143d81..73214a4 100644
--- a/include/gui/SurfaceComposerClient.h
+++ b/include/gui/SurfaceComposerClient.h
@@ -148,6 +148,11 @@
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,
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index e4922a4..0ffa932 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -558,6 +558,14 @@
: 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;