[Native] Replace android_color_mode usage with ColorMode. (8e272aac) · Commits · e / os / platform_frameworks_native

libs/gui/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,7 @@ cc_library_shared {
		],

		shared_libs: [
		"android.hardware.graphics.common@1.1",
		"libsync",
		"libbinder",
		"libbufferhubqueue", // TODO(b/70046255): Remove this once BufferHub is integrated into libgui.
		@@ -151,6 +152,7 @@ cc_library_shared {
		"libui",
		"android.hidl.token@1.0-utils",
		"android.hardware.graphics.bufferqueue@1.0",
		"android.hardware.graphics.common@1.1",
		],

		export_header_lib_headers: [

libs/gui/ISurfaceComposer.cpp

+13 −13

Original line number	Diff line number	Diff line
		@@ -350,7 +350,7 @@ public:
		}

		virtual status_t getDisplayColorModes(const sp<IBinder>& display,
		Vector<android_color_mode_t>* outColorModes) {
		Vector<ColorMode>* outColorModes) {
		Parcel data, reply;
		status_t result = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
		if (result != NO_ERROR) {
		@@ -373,34 +373,34 @@ public:
		outColorModes->clear();
		outColorModes->resize(numModes);
		for (size_t i = 0; i < numModes; ++i) {
		outColorModes->replaceAt(static_cast<android_color_mode_t>(reply.readInt32()), i);
		outColorModes->replaceAt(static_cast<ColorMode>(reply.readInt32()), i);
		}
		}
		return result;
		}

		virtual android_color_mode_t getActiveColorMode(const sp<IBinder>& display) {
		virtual ColorMode getActiveColorMode(const sp<IBinder>& display) {
		Parcel data, reply;
		status_t result = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
		if (result != NO_ERROR) {
		ALOGE("getActiveColorMode failed to writeInterfaceToken: %d", result);
		return static_cast<android_color_mode_t>(result);
		return static_cast<ColorMode>(result);
		}
		result = data.writeStrongBinder(display);
		if (result != NO_ERROR) {
		ALOGE("getActiveColorMode failed to writeStrongBinder: %d", result);
		return static_cast<android_color_mode_t>(result);
		return static_cast<ColorMode>(result);
		}
		result = remote()->transact(BnSurfaceComposer::GET_ACTIVE_COLOR_MODE, data, &reply);
		if (result != NO_ERROR) {
		ALOGE("getActiveColorMode failed to transact: %d", result);
		return static_cast<android_color_mode_t>(result);
		return static_cast<ColorMode>(result);
		}
		return static_cast<android_color_mode_t>(reply.readInt32());
		return static_cast<ColorMode>(reply.readInt32());
		}

		virtual status_t setActiveColorMode(const sp<IBinder>& display,
		android_color_mode_t colorMode) {
		ColorMode colorMode) {
		Parcel data, reply;
		status_t result = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
		if (result != NO_ERROR) {
		@@ -412,7 +412,7 @@ public:
		ALOGE("setActiveColorMode failed to writeStrongBinder: %d", result);
		return result;
		}
		result = data.writeInt32(colorMode);
		result = data.writeInt32(static_cast<int32_t>(colorMode));
		if (result != NO_ERROR) {
		ALOGE("setActiveColorMode failed to writeInt32: %d", result);
		return result;
		@@ -739,7 +739,7 @@ status_t BnSurfaceComposer::onTransact(
		}
		case GET_DISPLAY_COLOR_MODES: {
		CHECK_INTERFACE(ISurfaceComposer, data, reply);
		Vector<android_color_mode_t> colorModes;
		Vector<ColorMode> colorModes;
		sp<IBinder> display = nullptr;
		status_t result = data.readStrongBinder(&display);
		if (result != NO_ERROR) {
		@@ -751,7 +751,7 @@ status_t BnSurfaceComposer::onTransact(
		if (result == NO_ERROR) {
		reply->writeUint32(static_cast<uint32_t>(colorModes.size()));
		for (size_t i = 0; i < colorModes.size(); ++i) {
		reply->writeInt32(colorModes[i]);
		reply->writeInt32(static_cast<int32_t>(colorModes[i]));
		}
		}
		return NO_ERROR;
		@@ -764,7 +764,7 @@ status_t BnSurfaceComposer::onTransact(
		ALOGE("getActiveColorMode failed to readStrongBinder: %d", result);
		return result;
		}
		android_color_mode_t colorMode = getActiveColorMode(display);
		ColorMode colorMode = getActiveColorMode(display);
		result = reply->writeInt32(static_cast<int32_t>(colorMode));
		return result;
		}
		@@ -783,7 +783,7 @@ status_t BnSurfaceComposer::onTransact(
		return result;
		}
		result = setActiveColorMode(display,
		static_cast<android_color_mode_t>(colorModeInt));
		static_cast<ColorMode>(colorModeInt));
		result = reply->writeInt32(result);
		return result;
		}

libs/gui/Surface.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -326,7 +326,7 @@ status_t Surface::getWideColorSupport(bool* supported) {

		sp<IBinder> display(
		composerService()->getBuiltInDisplay(ISurfaceComposer::eDisplayIdMain));
		Vector<android_color_mode_t> colorModes;
		Vector<ColorMode> colorModes;
		status_t err =
		composerService()->getDisplayColorModes(display, &colorModes);

		@@ -338,11 +338,11 @@ status_t Surface::getWideColorSupport(bool* supported) {
		&ISurfaceFlingerConfigs::hasWideColorDisplay>(false);

		*supported = false;
		for (android_color_mode_t colorMode : colorModes) {
		for (ColorMode colorMode : colorModes) {
		switch (colorMode) {
		case HAL_COLOR_MODE_DISPLAY_P3:
		case HAL_COLOR_MODE_ADOBE_RGB:
		case HAL_COLOR_MODE_DCI_P3:
		case ColorMode::DISPLAY_P3:
		case ColorMode::ADOBE_RGB:
		case ColorMode::DCI_P3:
		if (wideColorBoardConfig) {
		*supported = true;
		}

libs/gui/SurfaceComposerClient.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -698,16 +698,16 @@ status_t SurfaceComposerClient::setActiveConfig(const sp<IBinder>& display, int
		}

		status_t SurfaceComposerClient::getDisplayColorModes(const sp<IBinder>& display,
		Vector<android_color_mode_t>* outColorModes) {
		Vector<ColorMode>* outColorModes) {
		return ComposerService::getComposerService()->getDisplayColorModes(display, outColorModes);
		}

		android_color_mode_t SurfaceComposerClient::getActiveColorMode(const sp<IBinder>& display) {
		ColorMode SurfaceComposerClient::getActiveColorMode(const sp<IBinder>& display) {
		return ComposerService::getComposerService()->getActiveColorMode(display);
		}

		status_t SurfaceComposerClient::setActiveColorMode(const sp<IBinder>& display,
		android_color_mode_t colorMode) {
		ColorMode colorMode) {
		return ComposerService::getComposerService()->setActiveColorMode(display, colorMode);
		}

libs/gui/include/gui/ISurfaceComposer.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include <ui/FrameStats.h>
		#include <ui/PixelFormat.h>
		#include <ui/GraphicBuffer.h>
		#include <ui/GraphicsTypes.h>

		#include <vector>

		@@ -160,10 +161,10 @@ public:
		virtual status_t setActiveConfig(const sp<IBinder>& display, int id) = 0;

		virtual status_t getDisplayColorModes(const sp<IBinder>& display,
		Vector<android_color_mode_t>* outColorModes) = 0;
		virtual android_color_mode_t getActiveColorMode(const sp<IBinder>& display) = 0;
		Vector<ColorMode>* outColorModes) = 0;
		virtual ColorMode getActiveColorMode(const sp<IBinder>& display) = 0;
		virtual status_t setActiveColorMode(const sp<IBinder>& display,
		android_color_mode_t colorMode) = 0;
		ColorMode colorMode) = 0;

		/* Capture the specified screen. requires READ_FRAME_BUFFER permission
		* This function will fail if there is a secure window on screen.