Snap for 8515382 from 35f6eafffe1577b25f759e5aa815832b18847d24 to tm-release (b9d88df7) · Commits · e / os / android_frameworks_native

include/android/input.h

+15 −4

Original line number	Diff line number	Diff line
		@@ -810,7 +810,7 @@ enum {
		/**
		* Constants that identify different gesture classification types.
		*/
		enum {
		enum AMotionClassification : uint32_t {
		/**
		* Classification constant: None.
		*
		@@ -820,7 +820,8 @@ enum {
		/**
		* Classification constant: Ambiguous gesture.
		*
		* The user's intent with respect to the current event stream is not yet determined.
		* The user's intent with respect to the current event stream is not yet determined. Events
		* starting in AMBIGUOUS_GESTURE will eventually resolve into either DEEP_PRESS or NONE.
		* Gestural actions, such as scrolling, should be inhibited until the classification resolves
		* to another value or the event stream ends.
		*/
		@@ -1357,8 +1358,17 @@ float AMotionEvent_getHistoricalAxisValue(const AInputEvent* motion_event,
		* Get the action button for the motion event. Returns a valid action button when the
		* event is associated with a button press or button release action. For other actions
		* the return value is undefined.
		*
		* @see #AMOTION_EVENT_BUTTON_PRIMARY
		* @see #AMOTION_EVENT_BUTTON_SECONDARY
		* @see #AMOTION_EVENT_BUTTON_TERTIARY
		* @see #AMOTION_EVENT_BUTTON_BACK
		* @see #AMOTION_EVENT_BUTTON_FORWARD
		* @see #AMOTION_EVENT_BUTTON_STYLUS_PRIMARY
		* @see #AMOTION_EVENT_BUTTON_STYLUS_SECONDARY
		*/
		int32_t AMotionEvent_getActionButton(const AInputEvent* motion_event);
		int32_t AMotionEvent_getActionButton(const AInputEvent* motion_event)
		__INTRODUCED_IN(__ANDROID_API_T__);

		/**
		* Returns the classification for the current gesture.
		@@ -1368,7 +1378,8 @@ int32_t AMotionEvent_getActionButton(const AInputEvent* motion_event);
		* @see #AMOTION_EVENT_CLASSIFICATION_AMBIGUOUS_GESTURE
		* @see #AMOTION_EVENT_CLASSIFICATION_DEEP_PRESS
		*/
		int32_t AMotionEvent_getClassification(const AInputEvent* motion_event);
		int32_t AMotionEvent_getClassification(const AInputEvent* motion_event)
		__INTRODUCED_IN(__ANDROID_API_T__);

		/**
		* Creates a native AInputEvent* object that is a copy of the specified Java

libs/binder/include/binder/RpcSession.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,9 +35,9 @@ class RpcState;
		class RpcTransport;
		class FdTrigger;

		constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION_NEXT = 0;
		constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION_NEXT = 1;
		constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL = 0xF0000000;
		constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION = RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL;
		constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION = 0;

		/**
		* This represents a session (group of connections) between a client

libs/binder/tests/binderRpcWireProtocolTest.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -237,8 +237,9 @@ TEST(RpcWire, CurrentVersion) {
		checkRepr(kCurrentRepr, RPC_WIRE_PROTOCOL_VERSION);
		}

		static_assert(RPC_WIRE_PROTOCOL_VERSION == RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL,
		"you better update this test!");
		static_assert(RPC_WIRE_PROTOCOL_VERSION == 0,
		"If the binder wire protocol is updated, this test should test additional versions. "
		"The binder wire protocol should only be updated on upstream AOSP.");

		TEST(RpcWire, ReleaseBranchHasFrozenRpcWireProtocol) {
		if (RPC_WIRE_PROTOCOL_VERSION == RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL) {

libs/gui/SurfaceComposerClient.cpp

+12 −0

Original line number	Diff line number	Diff line
		@@ -1495,6 +1495,18 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setBuffe
		s->bufferData = std::move(bufferData);
		registerSurfaceControlForCallback(sc);

		// With the current infrastructure, a release callback will not be invoked if there's no
		// transaction callback in the case when a buffer is latched and not released early. This is
		// because the legacy implementation didn't have a release callback and sent releases in the
		// transaction callback. Because of this, we need to make sure to have a transaction callback
		// set up when a buffer is sent in a transaction to ensure the caller gets the release
		// callback, regardless if they set up a transaction callback.
		//
		// TODO (b/230380821): Remove when release callbacks are separated from transaction callbacks
		addTransactionCompletedCallback([](void*, nsecs_t, const sp<Fence>&,
		const std::vector<SurfaceControlStats>&) {},
		nullptr);

		mContainsBuffer = true;
		return *this;
		}

libs/renderengine/skia/Cache.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -439,7 +439,7 @@ void Cache::primeShaderCache(SkiaRenderEngine* renderengine) {

		const nsecs_t timeAfter = systemTime();
		const float compileTimeMs = static_cast<float>(timeAfter - timeBefore) / 1.0E6;
		const int shadersCompiled = renderengine->reportShadersCompiled();
		const int shadersCompiled = renderengine->reportShadersCompiled() - previousCount;
		ALOGD("Shader cache generated %d shaders in %f ms\n", shadersCompiled, compileTimeMs);
		}
		}