Snap for 12465365 from 8ea4421c67405c42e670d219e097d290b77a4416 to 25Q1-release (dfb5c32c) · Commits · e / os / android_frameworks_native

include/input/Resampler.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,8 @@ public:
		* extrapolation takes place and `resampleTime` is too far in the future. If `futureSample` is
		* not null, interpolation will occur. If `futureSample` is null and there is enough historical
		* data, LegacyResampler will extrapolate. Otherwise, no resampling takes place and
		* `motionEvent` is unmodified.
		* `motionEvent` is unmodified. Furthermore, motionEvent is not resampled if resampleTime equals
		* the last sample eventTime of motionEvent.
		*/
		void resampleMotionEvent(std::chrono::nanoseconds frameTime, MotionEvent& motionEvent,
		const InputMessage* futureSample) override;

+14 −0

Original line number	Diff line number	Diff line
		@@ -1939,6 +1939,20 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setDesir
		return *this;
		}

		SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setLuts(
		const sp<SurfaceControl>& sc, const base::unique_fd& /lutFd/,
		const std::vector<int32_t>& /offsets/, const std::vector<int32_t>& /dimensions/,
		const std::vector<int32_t>& /sizes/, const std::vector<int32_t>& /samplingKeys/) {
		layer_state_t* s = getLayerState(sc);
		if (!s) {
		mStatus = BAD_INDEX;
		return *this;
		}
		// TODO (b/329472856): update layer_state_t for lut(s)
		registerSurfaceControlForCallback(sc);
		return *this;
		}

		SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setCachingHint(
		const sp<SurfaceControl>& sc, gui::CachingHint cachingHint) {
		layer_state_t* s = getLayerState(sc);

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.gui;

		import android.gui.LutProperties;
		import android.os.ParcelFileDescriptor;

		/**
		* This mirrors aidl::android::hardware::graphics::composer3::Lut definition
		* @hide
		*/
		parcelable Lut {
		@nullable ParcelFileDescriptor pfd;

		LutProperties lutProperties;
		}
		No newline at end of file

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.gui;

		/**
		* This mirrors aidl::android::hardware::graphics::composer3::LutProperties definition.
		* @hide
		*/
		parcelable LutProperties {
		@Backing(type="int")
		enum Dimension { ONE_D = 1, THREE_D = 3 }
		Dimension dimension;

		long size;
		@Backing(type="int")
		enum SamplingKey { RGB, MAX_RGB }
		SamplingKey[] samplingKeys;
		}
		No newline at end of file

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.gui;

		import android.gui.LutProperties;

		/** @hide */
		parcelable OverlayProperties {
		parcelable SupportedBufferCombinations {
		@@ -27,4 +29,6 @@ parcelable OverlayProperties {
		SupportedBufferCombinations[] combinations;

		boolean supportMixedColorSpaces;

		@nullable LutProperties[] lutProperties;
		}