Snap for 11473031 from 43cacc5820060c97e8d1c6192f5912a39932bf61 to 24Q2-release (46920d36) · Commits · e / os / android_frameworks_native

libs/binder/IPCThreadState.cpp

+1 −19

Original line number	Diff line number	Diff line
		@@ -922,28 +922,10 @@ void IPCThreadState::decWeakHandle(int32_t handle)
		flushIfNeeded();
		}

		status_t IPCThreadState::attemptIncStrongHandle(int32_t handle)
		{
		#if HAS_BC_ATTEMPT_ACQUIRE
		LOG_REMOTEREFS("IPCThreadState::attemptIncStrongHandle(%d)\n", handle);
		mOut.writeInt32(BC_ATTEMPT_ACQUIRE);
		mOut.writeInt32(0); // xxx was thread priority
		mOut.writeInt32(handle);
		status_t result = UNKNOWN_ERROR;

		waitForResponse(NULL, &result);

		#if LOG_REFCOUNTS
		ALOGV("IPCThreadState::attemptIncStrongHandle(%ld) = %s\n",
		handle, result == NO_ERROR ? "SUCCESS" : "FAILURE");
		#endif

		return result;
		#else
		status_t IPCThreadState::attemptIncStrongHandle(int32_t handle) {
		(void)handle;
		ALOGE("%s(%d): Not supported\n", __func__, handle);
		return INVALID_OPERATION;
		#endif
		}

		void IPCThreadState::expungeHandle(int32_t handle, IBinder* binder)

libs/gui/tests/AndroidTest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		<option name="cleanup" value="true" />
		<option name="push" value="libgui_test->/data/local/tmp/libgui_test" />
		</target_preparer>
		<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
		<target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
		<option name="force-skip-system-props" value="true" /> <!-- avoid restarting device -->
		<option name="screen-always-on" value="on" />

libs/input/Input.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -1037,6 +1037,9 @@ std::ostream& operator<<(std::ostream& out, const MotionEvent& event) {
		if (event.getMetaState() != 0) {
		out << ", metaState=" << event.getMetaState();
		}
		if (event.getFlags() != 0) {
		out << ", flags=0x" << std::hex << event.getFlags() << std::dec;
		}
		if (event.getEdgeFlags() != 0) {
		out << ", edgeFlags=" << event.getEdgeFlags();
		}

libs/ui/DisplayIdentification.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ uint64_t shiftMix(uint64_t val) {
		return val ^ (val >> 47);
		}

		__attribute__((no_sanitize("unsigned-integer-overflow")))
		uint64_t hash64Len16(uint64_t u, uint64_t v) {
		constexpr uint64_t kMul = 0x9ddfea08eb382d69;
		uint64_t a = (u ^ v) * kMul;
		@@ -57,6 +58,7 @@ uint64_t hash64Len16(uint64_t u, uint64_t v) {
		return b;
		}

		__attribute__((no_sanitize("unsigned-integer-overflow")))
		uint64_t hash64Len0To16(const char* s, uint64_t len) {
		constexpr uint64_t k2 = 0x9ae16a3b2f90404f;
		constexpr uint64_t k3 = 0xc949d7c7509e6557;

services/inputflinger/dispatcher/InputDispatcher.cpp

+8 −3

Original line number	Diff line number	Diff line
		@@ -3422,6 +3422,9 @@ void InputDispatcher::enqueueDispatchEntryLocked(const std::shared_ptr<Connectio
		InputTarget::Flags::WINDOW_IS_PARTIALLY_OBSCURED)) {
		resolvedFlags \|= AMOTION_EVENT_FLAG_WINDOW_IS_PARTIALLY_OBSCURED;
		}
		if (dispatchEntry->targetFlags.test(InputTarget::Flags::NO_FOCUS_CHANGE)) {
		resolvedFlags \|= AMOTION_EVENT_FLAG_NO_FOCUS_CHANGE;
		}

		dispatchEntry->resolvedFlags = resolvedFlags;
		if (resolvedAction != motionEntry.action) {
		@@ -3496,8 +3499,7 @@ void InputDispatcher::enqueueDispatchEntryLocked(const std::shared_ptr<Connectio
		<< "~ dropping inconsistent event: " << *dispatchEntry;
		return; // skip the inconsistent event
		}

		if ((resolvedMotion->flags & AMOTION_EVENT_FLAG_NO_FOCUS_CHANGE) &&
		if ((dispatchEntry->resolvedFlags & AMOTION_EVENT_FLAG_NO_FOCUS_CHANGE) &&
		(resolvedMotion->policyFlags & POLICY_FLAG_TRUSTED)) {
		// Skip reporting pointer down outside focus to the policy.
		break;
		@@ -5612,6 +5614,8 @@ bool InputDispatcher::transferTouchFocus(const sp<IBinder>& fromToken, const sp<
		if (canReceiveForegroundTouches(*toWindowHandle->getInfo())) {
		newTargetFlags \|= InputTarget::Flags::FOREGROUND;
		}
		// Transferring touch focus using this API should not effect the focused window.
		newTargetFlags \|= InputTarget::Flags::NO_FOCUS_CHANGE;
		state->addOrUpdateWindow(toWindowHandle, InputTarget::DispatchMode::AS_IS, newTargetFlags,
		deviceId, pointers, downTimeInTarget);

		@@ -7000,7 +7004,8 @@ void InputDispatcher::transferWallpaperTouch(ftl::Flags<InputTarget::Flags> oldT

		if (newWallpaper != nullptr) {
		nsecs_t downTimeInTarget = now();
		ftl::Flags<InputTarget::Flags> wallpaperFlags = oldTargetFlags & InputTarget::Flags::SPLIT;
		ftl::Flags<InputTarget::Flags> wallpaperFlags = newTargetFlags;
		wallpaperFlags \|= oldTargetFlags & InputTarget::Flags::SPLIT;
		wallpaperFlags \|= InputTarget::Flags::WINDOW_IS_OBSCURED \|
		InputTarget::Flags::WINDOW_IS_PARTIALLY_OBSCURED;
		state.addOrUpdateWindow(newWallpaper, InputTarget::DispatchMode::AS_IS, wallpaperFlags,