diff options
| author | Marin Shalamanov <shalamanov@google.com> | 2021-02-22 18:28:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-02-22 18:28:27 +0000 |
| commit | 1b520a6d3f38d2bc6c288fde8fb76e65efd98cbc (patch) | |
| tree | 49994dc599d1837c01c91baf80778896380809cc /libs | |
| parent | 1c74818f30450346135777fd9f54de865655a9b9 (diff) | |
| parent | 463ad8ee22fecc4e0f53757c618c5e77239f6467 (diff) | |
Merge "Introduce DynamicDisplayInfo" into sc-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/tests/common/TestContext.cpp | 8 | ||||
| -rw-r--r-- | libs/hwui/tests/common/TestContext.h | 4 | ||||
| -rw-r--r-- | libs/input/MouseCursorController.h | 1 | ||||
| -rw-r--r-- | libs/input/PointerController.h | 1 | ||||
| -rw-r--r-- | libs/input/PointerControllerContext.h | 1 |
5 files changed, 6 insertions, 9 deletions
diff --git a/libs/hwui/tests/common/TestContext.cpp b/libs/hwui/tests/common/TestContext.cpp index 6a9a98d6743b..898c64bd4159 100644 --- a/libs/hwui/tests/common/TestContext.cpp +++ b/libs/hwui/tests/common/TestContext.cpp @@ -22,16 +22,16 @@ namespace android { namespace uirenderer { namespace test { -const DisplayInfo& getDisplayInfo() { - static DisplayInfo info = [] { - DisplayInfo info; +const ui::StaticDisplayInfo& getDisplayInfo() { + static ui::StaticDisplayInfo info = [] { + ui::StaticDisplayInfo info; #if HWUI_NULL_GPU info.density = 2.f; #else const sp<IBinder> token = SurfaceComposerClient::getInternalDisplayToken(); LOG_ALWAYS_FATAL_IF(!token, "%s: No internal display", __FUNCTION__); - const status_t status = SurfaceComposerClient::getDisplayInfo(token, &info); + const status_t status = SurfaceComposerClient::getStaticDisplayInfo(token, &info); LOG_ALWAYS_FATAL_IF(status, "%s: Failed to get display info", __FUNCTION__); #endif return info; diff --git a/libs/hwui/tests/common/TestContext.h b/libs/hwui/tests/common/TestContext.h index 7d2f6d8ea731..9d00366daffe 100644 --- a/libs/hwui/tests/common/TestContext.h +++ b/libs/hwui/tests/common/TestContext.h @@ -23,8 +23,8 @@ #include <gui/Surface.h> #include <gui/SurfaceComposerClient.h> #include <gui/SurfaceControl.h> -#include <ui/DisplayInfo.h> #include <ui/DisplayMode.h> +#include <ui/StaticDisplayInfo.h> #include <utils/Looper.h> #include <atomic> @@ -36,7 +36,7 @@ namespace android { namespace uirenderer { namespace test { -const DisplayInfo& getDisplayInfo(); +const ui::StaticDisplayInfo& getDisplayInfo(); const ui::DisplayMode& getActiveDisplayMode(); inline const ui::Size& getActiveDisplayResolution() { diff --git a/libs/input/MouseCursorController.h b/libs/input/MouseCursorController.h index e6dfc4c6f99a..c0ab58bd2e7e 100644 --- a/libs/input/MouseCursorController.h +++ b/libs/input/MouseCursorController.h @@ -20,7 +20,6 @@ #include <gui/DisplayEventReceiver.h> #include <input/DisplayViewport.h> #include <input/Input.h> -#include <ui/DisplayInfo.h> #include <utils/BitSet.h> #include <utils/Looper.h> #include <utils/RefBase.h> diff --git a/libs/input/PointerController.h b/libs/input/PointerController.h index 827fcf1e1bc1..97567bab202b 100644 --- a/libs/input/PointerController.h +++ b/libs/input/PointerController.h @@ -21,7 +21,6 @@ #include <gui/DisplayEventReceiver.h> #include <input/DisplayViewport.h> #include <input/Input.h> -#include <ui/DisplayInfo.h> #include <utils/BitSet.h> #include <utils/Looper.h> #include <utils/RefBase.h> diff --git a/libs/input/PointerControllerContext.h b/libs/input/PointerControllerContext.h index 98073fea323e..26a65a47471d 100644 --- a/libs/input/PointerControllerContext.h +++ b/libs/input/PointerControllerContext.h @@ -21,7 +21,6 @@ #include <gui/DisplayEventReceiver.h> #include <input/DisplayViewport.h> #include <input/Input.h> -#include <ui/DisplayInfo.h> #include <utils/BitSet.h> #include <utils/Looper.h> #include <utils/RefBase.h> |