summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2012-08-27 17:06:39 -0700
committer Jeff Brown <jeffbrown@google.com> 2012-08-27 17:20:53 -0700
commita50b51c03aca449920fc8581a738032a7bce7150 (patch)
tree1a8e8a4ef6c7fe48c9790c5960be013c2fd913e5
parent1ae49e3fef34ee38f8dfeb08b5914e3362af3b2f (diff)
Compatibility work around for bad graphics driver dependency.
This is a compatibility shim for one product whose drivers are depending on SurfaceComposerClient::getDisplayInfo( int, DisplayInfo*) when it really shouldn't. Revert this patch when the problem has been resolved. Bug: 7065398 Change-Id: I6542691b81fd1b1e1d79500a62e82d40a3d51db7
-rw-r--r--include/gui/SurfaceComposerClient.h5
-rw-r--r--libs/gui/SurfaceComposerClient.cpp9
2 files changed, 14 insertions, 0 deletions
diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h
index 295e7fb7dc..a143d812ec 100644
--- a/include/gui/SurfaceComposerClient.h
+++ b/include/gui/SurfaceComposerClient.h
@@ -67,6 +67,11 @@ public:
// Get information about a display
static status_t getDisplayInfo(const sp<IBinder>& display, DisplayInfo* info);
+ // 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).
+ static status_t getDisplayInfo(int32_t displayId, DisplayInfo* info);
+
// ------------------------------------------------------------------------
// surface creation / destruction
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index d55d42e9b4..e4922a4408 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -543,6 +543,15 @@ status_t SurfaceComposerClient::getDisplayInfo(
return ComposerService::getComposerService()->getDisplayInfo(display, info);
}
+// 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 SurfaceComposerClient::getDisplayInfo(
+ int32_t displayId, DisplayInfo* info)
+{
+ return getDisplayInfo(getBuiltInDisplay(displayId), info);
+}
+
// ----------------------------------------------------------------------------
ScreenshotClient::ScreenshotClient()