Merge "Moved brightness from Lights to SF." (4b131b9a) · Commits · e / os / android_frameworks_native-old

libs/gui/ISurfaceComposer.cpp

+82 −0

Original line number	Diff line number	Diff line
		@@ -860,6 +860,59 @@ public:
		}
		return reply.readInt32();
		}

		virtual status_t getDisplayBrightnessSupport(const sp<IBinder>& displayToken,
		bool* outSupport) const {
		Parcel data, reply;
		status_t error = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
		if (error != NO_ERROR) {
		ALOGE("getDisplayBrightnessSupport: failed to write interface token: %d", error);
		return error;
		}
		error = data.writeStrongBinder(displayToken);
		if (error != NO_ERROR) {
		ALOGE("getDisplayBrightnessSupport: failed to write display token: %d", error);
		return error;
		}
		error = remote()->transact(BnSurfaceComposer::GET_DISPLAY_BRIGHTNESS_SUPPORT, data, &reply);
		if (error != NO_ERROR) {
		ALOGE("getDisplayBrightnessSupport: failed to transact: %d", error);
		return error;
		}
		bool support;
		error = reply.readBool(&support);
		if (error != NO_ERROR) {
		ALOGE("getDisplayBrightnessSupport: failed to read support: %d", error);
		return error;
		}
		*outSupport = support;
		return NO_ERROR;
		}

		virtual status_t setDisplayBrightness(const sp<IBinder>& displayToken, float brightness) const {
		Parcel data, reply;
		status_t error = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
		if (error != NO_ERROR) {
		ALOGE("setDisplayBrightness: failed to write interface token: %d", error);
		return error;
		}
		error = data.writeStrongBinder(displayToken);
		if (error != NO_ERROR) {
		ALOGE("setDisplayBrightness: failed to write display token: %d", error);
		return error;
		}
		error = data.writeFloat(brightness);
		if (error != NO_ERROR) {
		ALOGE("setDisplayBrightness: failed to write brightness: %d", error);
		return error;
		}
		error = remote()->transact(BnSurfaceComposer::SET_DISPLAY_BRIGHTNESS, data, &reply);
		if (error != NO_ERROR) {
		ALOGE("setDisplayBrightness: failed to transact: %d", error);
		return error;
		}
		return NO_ERROR;
		}
		};

		// Out-of-line virtual method definition to trigger vtable emission in this
		@@ -1390,6 +1443,35 @@ status_t BnSurfaceComposer::onTransact(
		reply->writeInt32(result);
		return result;
		}
		case GET_DISPLAY_BRIGHTNESS_SUPPORT: {
		CHECK_INTERFACE(ISurfaceComposer, data, reply);
		sp<IBinder> displayToken;
		status_t error = data.readNullableStrongBinder(&displayToken);
		if (error != NO_ERROR) {
		ALOGE("getDisplayBrightnessSupport: failed to read display token: %d", error);
		return error;
		}
		bool support = false;
		error = getDisplayBrightnessSupport(displayToken, &support);
		reply->writeBool(support);
		return error;
		}
		case SET_DISPLAY_BRIGHTNESS: {
		CHECK_INTERFACE(ISurfaceComposer, data, reply);
		sp<IBinder> displayToken;
		status_t error = data.readNullableStrongBinder(&displayToken);
		if (error != NO_ERROR) {
		ALOGE("setDisplayBrightness: failed to read display token: %d", error);
		return error;
		}
		float brightness = -1.0f;
		error = data.readFloat(&brightness);
		if (error != NO_ERROR) {
		ALOGE("setDisplayBrightness: failed to read brightness: %d", error);
		return error;
		}
		return setDisplayBrightness(displayToken, brightness);
		}
		default: {
		return BBinder::onTransact(code, data, reply, flags);
		}

libs/gui/SurfaceComposerClient.cpp

+11 −0

Original line number	Diff line number	Diff line
		@@ -1503,6 +1503,17 @@ status_t SurfaceComposerClient::removeRegionSamplingListener(
		return ComposerService::getComposerService()->removeRegionSamplingListener(listener);
		}

		bool SurfaceComposerClient::getDisplayBrightnessSupport(const sp<IBinder>& displayToken) {
		bool support = false;
		ComposerService::getComposerService()->getDisplayBrightnessSupport(displayToken, &support);
		return support;
		}

		status_t SurfaceComposerClient::setDisplayBrightness(const sp<IBinder>& displayToken,
		float brightness) {
		return ComposerService::getComposerService()->setDisplayBrightness(displayToken, brightness);
		}

		// ----------------------------------------------------------------------------

		status_t ScreenshotClient::capture(const sp<IBinder>& display, const ui::Dataspace reqDataSpace,

libs/gui/include/gui/ISurfaceComposer.h

+33 −0

Original line number	Diff line number	Diff line
		@@ -376,6 +376,37 @@ public:
		*/
		virtual status_t getAllowedDisplayConfigs(const sp<IBinder>& displayToken,
		std::vector<int32_t>* outAllowedConfigs) = 0;
		/*
		* Gets whether brightness operations are supported on a display.
		*
		* displayToken
		* The token of the display.
		* outSupport
		* An output parameter for whether brightness operations are supported.
		*
		* Returns NO_ERROR upon success. Otherwise,
		* NAME_NOT_FOUND if the display is invalid, or
		* BAD_VALUE if the output parameter is invalid.
		*/
		virtual status_t getDisplayBrightnessSupport(const sp<IBinder>& displayToken,
		bool* outSupport) const = 0;

		/*
		* Sets the brightness of a display.
		*
		* displayToken
		* The token of the display whose brightness is set.
		* brightness
		* A number between 0.0f (minimum brightness) and 1.0 (maximum brightness), or -1.0f to
		* turn the backlight off.
		*
		* Returns NO_ERROR upon success. Otherwise,
		* NAME_NOT_FOUND if the display is invalid, or
		* BAD_VALUE if the brightness is invalid, or
		* INVALID_OPERATION if brightness operations are not supported.
		*/
		virtual status_t setDisplayBrightness(const sp<IBinder>& displayToken,
		float brightness) const = 0;
		};

		// ----------------------------------------------------------------------------
		@@ -425,6 +456,8 @@ public:
		REMOVE_REGION_SAMPLING_LISTENER,
		SET_ALLOWED_DISPLAY_CONFIGS,
		GET_ALLOWED_DISPLAY_CONFIGS,
		GET_DISPLAY_BRIGHTNESS_SUPPORT,
		SET_DISPLAY_BRIGHTNESS,
		// Always append new enum to the end.
		};

libs/gui/include/gui/SurfaceComposerClient.h

+26 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,32 @@ public:
		// Queries whether a given display is wide color display.
		static status_t isWideColorDisplay(const sp<IBinder>& display, bool* outIsWideColorDisplay);

		/*
		* Returns whether brightness operations are supported on a display.
		*
		* displayToken
		* The token of the display.
		*
		* Returns whether brightness operations are supported on a display or not.
		*/
		static bool getDisplayBrightnessSupport(const sp<IBinder>& displayToken);

		/*
		* Sets the brightness of a display.
		*
		* displayToken
		* The token of the display whose brightness is set.
		* brightness
		* A number between 0.0 (minimum brightness) and 1.0 (maximum brightness), or -1.0f to
		* turn the backlight off.
		*
		* Returns NO_ERROR upon success. Otherwise,
		* NAME_NOT_FOUND if the display handle is invalid, or
		* BAD_VALUE if the brightness value is invalid, or
		* INVALID_OPERATION if brightness operaetions are not supported.
		*/
		static status_t setDisplayBrightness(const sp<IBinder>& displayToken, float brightness);

		// ------------------------------------------------------------------------
		// surface creation / destruction

libs/gui/tests/Surface_test.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -669,6 +669,14 @@ public:
		status_t getProtectedContentSupport(bool* /outSupported/) const override { return NO_ERROR; }

		status_t isWideColorDisplay(const sp<IBinder>&, bool*) const override { return NO_ERROR; }
		status_t getDisplayBrightnessSupport(const sp<IBinder>& /displayToken/,
		bool* /outSupport/) const override {
		return NO_ERROR;
		}
		status_t setDisplayBrightness(const sp<IBinder>& /displayToken/,
		float /brightness/) const override {
		return NO_ERROR;
		}

		status_t addRegionSamplingListener(const Rect& /samplingArea/,
		const sp<IBinder>& /stopLayerHandle/,