Merge "Tracking changes to renaming DisplayConfig to DisplayMode" into sc-dev am: 1affab88f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13474168
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I363a05411f3300d794cd089912574b8845749392
diff --git a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp
index e56c2d1..a3dc45b 100644
--- a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp
+++ b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp
@@ -41,14 +41,14 @@
#include <utils/Errors.h>
#include <utils/StrongPointer.h>
+#include <android-base/logging.h>
#include <android/hardware/automotive/evs/1.1/IEvsCamera.h>
#include <android/hardware/automotive/evs/1.1/IEvsCameraStream.h>
-#include <android/hardware/automotive/evs/1.1/IEvsEnumerator.h>
#include <android/hardware/automotive/evs/1.1/IEvsDisplay.h>
+#include <android/hardware/automotive/evs/1.1/IEvsEnumerator.h>
#include <android/hardware/camera/device/3.2/ICameraDevice.h>
-#include <android-base/logging.h>
#include <system/camera_metadata.h>
-#include <ui/DisplayConfig.h>
+#include <ui/DisplayMode.h>
#include <ui/DisplayState.h>
#include <ui/GraphicBuffer.h>
#include <ui/GraphicBufferAllocator.h>
@@ -622,7 +622,7 @@
ASSERT_GT(config.size(), 0);
ASSERT_GT(state.size(), 0);
- android::DisplayConfig* pConfig = (android::DisplayConfig*)config.data();
+ android::ui::DisplayMode* pConfig = (android::ui::DisplayMode*)config.data();
const auto width = pConfig->resolution.getWidth();
const auto height = pConfig->resolution.getHeight();
LOG(INFO) << " Resolution: " << width << "x" << height;