From 38b657265ccc5ae45bd7860a68b0d9373b47a2f3 Mon Sep 17 00:00:00 2001 From: Iliyan Malchev Date: Thu, 27 Sep 2012 15:08:29 -0700 Subject: [PATCH] Revert "Compatibility work around for bad graphics driver dependency." This reverts commit a50b51c03aca449920fc8581a738032a7bce7150 Change-Id: Ibdcd776a7f241dbb2475403ea04f939249774c41 --- include/gui/SurfaceComposerClient.h | 5 ----- libs/gui/SurfaceComposerClient.cpp | 9 --------- 2 files changed, 14 deletions(-) diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h index 7a14c6a08..bae388615 100644 --- a/include/gui/SurfaceComposerClient.h +++ b/include/gui/SurfaceComposerClient.h @@ -67,11 +67,6 @@ public: // Get information about a display static status_t getDisplayInfo(const sp& 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 9cf9cb52c..4165d01f7 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -552,15 +552,6 @@ 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()