Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815" into jb-mr1-dev
diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h
index 7a14c6a..bae3886 100644
--- a/include/gui/SurfaceComposerClient.h
+++ b/include/gui/SurfaceComposerClient.h
@@ -67,11 +67,6 @@
// 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 9cf9cb5..4165d01 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -552,15 +552,6 @@
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()