From 646f8ecfa96f04fb001d7edce54123946ab8929f Mon Sep 17 00:00:00 2001 From: Kriti Dang Date: Tue, 18 Jan 2022 14:35:02 +0100 Subject: Removing getSystemPreferredDisplayMode and adding it as part of DynamicDisplayInfo Bug: 209598222 Test: atest CtsBootDisplayModeTestCases Test: atest libcompositionengine_test Change-Id: I1ce0a5a3916b14e25212dd1d2fc4f5e82674fcd1 --- libs/ui/DynamicDisplayInfo.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libs/ui/DynamicDisplayInfo.cpp') diff --git a/libs/ui/DynamicDisplayInfo.cpp b/libs/ui/DynamicDisplayInfo.cpp index d5c4ef0c17..78ba9965b6 100644 --- a/libs/ui/DynamicDisplayInfo.cpp +++ b/libs/ui/DynamicDisplayInfo.cpp @@ -41,7 +41,8 @@ size_t DynamicDisplayInfo::getFlattenedSize() const { FlattenableHelpers::getFlattenedSize(activeColorMode) + FlattenableHelpers::getFlattenedSize(hdrCapabilities) + FlattenableHelpers::getFlattenedSize(autoLowLatencyModeSupported) + - FlattenableHelpers::getFlattenedSize(gameContentTypeSupported); + FlattenableHelpers::getFlattenedSize(gameContentTypeSupported) + + FlattenableHelpers::getFlattenedSize(preferredBootDisplayMode); } status_t DynamicDisplayInfo::flatten(void* buffer, size_t size) const { @@ -55,6 +56,7 @@ status_t DynamicDisplayInfo::flatten(void* buffer, size_t size) const { RETURN_IF_ERROR(FlattenableHelpers::flatten(&buffer, &size, hdrCapabilities)); RETURN_IF_ERROR(FlattenableHelpers::flatten(&buffer, &size, autoLowLatencyModeSupported)); RETURN_IF_ERROR(FlattenableHelpers::flatten(&buffer, &size, gameContentTypeSupported)); + RETURN_IF_ERROR(FlattenableHelpers::flatten(&buffer, &size, preferredBootDisplayMode)); return OK; } @@ -66,6 +68,7 @@ status_t DynamicDisplayInfo::unflatten(const void* buffer, size_t size) { RETURN_IF_ERROR(FlattenableHelpers::unflatten(&buffer, &size, &hdrCapabilities)); RETURN_IF_ERROR(FlattenableHelpers::unflatten(&buffer, &size, &autoLowLatencyModeSupported)); RETURN_IF_ERROR(FlattenableHelpers::unflatten(&buffer, &size, &gameContentTypeSupported)); + RETURN_IF_ERROR(FlattenableHelpers::unflatten(&buffer, &size, &preferredBootDisplayMode)); return OK; } -- cgit v1.2.3-59-g8ed1b