Merge cherrypicks of ['googleplex-android-review.googlesource.com/23117841'] into udc-release. (76bf4460) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/DisplayDevice.cpp

+0 −10

Original line number	Diff line number	Diff line
		@@ -50,8 +50,6 @@ namespace android {

		namespace hal = hardware::graphics::composer::hal;

		ui::Transform::RotationFlags DisplayDevice::sPrimaryDisplayRotationFlags = ui::Transform::ROT_0;

		DisplayDeviceCreationArgs::DisplayDeviceCreationArgs(
		const sp<SurfaceFlinger>& flinger, HWComposer& hwComposer, const wp<IBinder>& displayToken,
		std::shared_ptr<compositionengine::Display> compositionDisplay)
		@@ -282,10 +280,6 @@ void DisplayDevice::setProjection(ui::Rotation orientation, Rect layerStackSpace
		Rect orientedDisplaySpaceRect) {
		mOrientation = orientation;

		if (isPrimary()) {
		sPrimaryDisplayRotationFlags = ui::Transform::toRotationFlags(orientation);
		}

		// We need to take care of display rotation for globalTransform for case if the panel is not
		// installed aligned with device orientation.
		const auto transformOrientation = orientation + mPhysicalOrientation;
		@@ -326,10 +320,6 @@ std::optional<float> DisplayDevice::getStagedBrightness() const {
		return mStagedBrightness;
		}

		ui::Transform::RotationFlags DisplayDevice::getPrimaryDisplayRotationFlags() {
		return sPrimaryDisplayRotationFlags;
		}

		void DisplayDevice::dump(utils::Dumper& dumper) const {
		using namespace std::string_view_literals;

+0 −4

Original line number	Diff line number	Diff line
		@@ -109,8 +109,6 @@ public:
		ui::Rotation getPhysicalOrientation() const { return mPhysicalOrientation; }
		ui::Rotation getOrientation() const { return mOrientation; }

		static ui::Transform::RotationFlags getPrimaryDisplayRotationFlags();

		std::optional<float> getStagedBrightness() const REQUIRES(kMainThreadContext);
		ui::Transform::RotationFlags getTransformHint() const;
		const ui::Transform& getTransform() const;
		@@ -274,8 +272,6 @@ private:
		const ui::Rotation mPhysicalOrientation;
		ui::Rotation mOrientation = ui::ROTATION_0;

		static ui::Transform::RotationFlags sPrimaryDisplayRotationFlags;

		// Allow nullopt as initial power mode.
		using TracedPowerMode = TracedOrdinal<hardware::graphics::composer::hal::PowerMode>;
		std::optional<TracedPowerMode> mPowerMode;

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ struct DisplayInfo {
		ui::Transform transform;
		bool receivesInput;
		bool isSecure;
		// TODO(b/238781169) can eliminate once sPrimaryDisplayRotationFlags is removed.
		// TODO(b/259407931): can eliminate once SurfaceFlinger::sActiveDisplayRotationFlags is removed.
		bool isPrimary;
		bool isVirtual;
		ui::Transform::RotationFlags rotationFlags;

+1 −0

Original line number	Diff line number	Diff line
		@@ -667,6 +667,7 @@ void LayerSnapshotBuilder::resetRelativeState(LayerSnapshot& snapshot) {
		snapshot.relativeLayerMetadata.mMap.clear();
		}

		// TODO (b/259407931): Remove.
		uint32_t getPrimaryDisplayRotationFlags(
		const display::DisplayMap<ui::LayerStack, frontend::DisplayInfo>& displays) {
		for (auto& [_, display] : displays) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -2977,7 +2977,7 @@ bool Layer::updateGeometry() {
		if (mDrawingState.bufferTransform & ui::Transform::ROT_90) {
		std::swap(bufferWidth, bufferHeight);
		}
		uint32_t invTransform = DisplayDevice::getPrimaryDisplayRotationFlags();
		uint32_t invTransform = SurfaceFlinger::getActiveDisplayRotationFlags();
		if (mDrawingState.transformToDisplayInverse) {
		if (invTransform & ui::Transform::ROT_90) {
		std::swap(bufferWidth, bufferHeight);
		@@ -3304,7 +3304,7 @@ Rect Layer::getBufferSize(const State& /s/) const {
		}

		if (getTransformToDisplayInverse()) {
		uint32_t invTransform = DisplayDevice::getPrimaryDisplayRotationFlags();
		uint32_t invTransform = SurfaceFlinger::getActiveDisplayRotationFlags();
		if (invTransform & ui::Transform::ROT_90) {
		std::swap(bufWidth, bufHeight);
		}