From 37965d4d225e333b70110c5715998eebed5eedd2 Mon Sep 17 00:00:00 2001 From: Ady Abraham Date: Thu, 1 Nov 2018 13:43:32 -0700 Subject: ISurfaceComposer: rename isColorManagementUsed() Rename isColorManagementUsed() to getColorManagement() to follow the convention in ISurfaceComposer. Test: adb shell /data/nativetest64/SurfaceFlinger_test/SurfaceFlinger_test --gtest_filter=LayerTransactionTest.SetColorTransformBasic Change-Id: I63f75a98dbd230375f215a109a725672353eceef --- services/surfaceflinger/SurfaceFlinger.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'services/surfaceflinger/SurfaceFlinger.cpp') diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 5c31ada5ef..968fcd6acb 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -518,8 +518,12 @@ sp SurfaceFlinger::getBuiltInDisplay(int32_t id) { return mDisplayTokens[id]; } -bool SurfaceFlinger::isColorManagementUsed() const { - return useColorManagement; +status_t SurfaceFlinger::getColorManagement(bool* outGetColorManagement) const { + if (!outGetColorManagement) { + return BAD_VALUE; + } + *outGetColorManagement = useColorManagement; + return NO_ERROR; } void SurfaceFlinger::bootFinished() @@ -4757,7 +4761,7 @@ status_t SurfaceFlinger::CheckTransactCodeCredentials(uint32_t code) { case SET_TRANSACTION_STATE: // Creating a scoped connection is safe, as per discussion in ISurfaceComposer.h case CREATE_SCOPED_CONNECTION: - case IS_COLOR_MANAGEMET_USED: + case GET_COLOR_MANAGEMENT: case GET_COMPOSITION_PREFERENCE: { return OK; } -- cgit v1.2.3-59-g8ed1b