Merge "Make inputflinger_tests compile for musl" (632cbc83) · Commits · e / os / android_frameworks_native

services/inputflinger/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,7 @@ cc_defaults {
		host: {
		static_libs: [
		"libinput",
		"libui-types",
		],
		},
		},

services/inputflinger/dispatcher/AnrTracker.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ bool AnrTracker::empty() const {
		}

		// If empty() is false, return the time at which the next connection should cause an ANR
		// If empty() is true, return LONG_LONG_MAX
		// If empty() is true, return LLONG_MAX
		nsecs_t AnrTracker::firstTimeout() const {
		if (mAnrTimeouts.empty()) {
		return std::numeric_limits<nsecs_t>::max();

services/inputflinger/dispatcher/AnrTracker.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ public:

		bool empty() const;
		// If empty() is false, return the time at which the next connection should cause an ANR
		// If empty() is true, return LONG_LONG_MAX
		// If empty() is true, return LLONG_MAX
		nsecs_t firstTimeout() const;
		// Return the token of the next connection that should cause an ANR.
		// Do not call this unless empty() is false, you will encounter undefined behaviour.

services/inputflinger/dispatcher/InputDispatcher.cpp

+11 −11

Original line number	Diff line number	Diff line
		@@ -555,7 +555,7 @@ InputDispatcher::InputDispatcher(const sp<InputDispatcherPolicyInterface>& polic
		mLastDropReason(DropReason::NOT_DROPPED),
		mIdGenerator(IdGenerator::Source::INPUT_DISPATCHER),
		mAppSwitchSawKeyDown(false),
		mAppSwitchDueTime(LONG_LONG_MAX),
		mAppSwitchDueTime(LLONG_MAX),
		mNextUnblockedEvent(nullptr),
		mMonitorDispatchingTimeout(DEFAULT_INPUT_DISPATCHING_TIMEOUT),
		mDispatchEnabled(false),
		@@ -612,7 +612,7 @@ status_t InputDispatcher::stop() {
		}

		void InputDispatcher::dispatchOnce() {
		nsecs_t nextWakeupTime = LONG_LONG_MAX;
		nsecs_t nextWakeupTime = LLONG_MAX;
		{ // acquire lock
		std::scoped_lock _l(mLock);
		mDispatcherIsAlive.notify_all();
		@@ -626,7 +626,7 @@ void InputDispatcher::dispatchOnce() {
		// Run all pending commands if there are any.
		// If any commands were run then force the next poll to wake up immediately.
		if (runCommandsLockedInterruptable()) {
		nextWakeupTime = LONG_LONG_MIN;
		nextWakeupTime = LLONG_MIN;
		}

		// If we are still waiting for ack on some events,
		@@ -636,7 +636,7 @@ void InputDispatcher::dispatchOnce() {

		// We are about to enter an infinitely long sleep, because we have no commands or
		// pending or queued events
		if (nextWakeupTime == LONG_LONG_MAX) {
		if (nextWakeupTime == LLONG_MAX) {
		mDispatcherEnteredIdle.notify_all();
		}
		} // release lock
		@@ -681,14 +681,14 @@ void InputDispatcher::processNoFocusedWindowAnrLocked() {
		*/
		nsecs_t InputDispatcher::processAnrsLocked() {
		const nsecs_t currentTime = now();
		nsecs_t nextAnrCheck = LONG_LONG_MAX;
		nsecs_t nextAnrCheck = LLONG_MAX;
		// Check if we are waiting for a focused window to appear. Raise ANR if waited too long
		if (mNoFocusedWindowTimeoutTime.has_value() && mAwaitedFocusedApplication != nullptr) {
		if (currentTime >= *mNoFocusedWindowTimeoutTime) {
		processNoFocusedWindowAnrLocked();
		mAwaitedFocusedApplication.reset();
		mNoFocusedWindowTimeoutTime = std::nullopt;
		return LONG_LONG_MIN;
		return LLONG_MIN;
		} else {
		// Keep waiting. We will drop the event when mNoFocusedWindowTimeoutTime comes.
		nextAnrCheck = *mNoFocusedWindowTimeoutTime;
		@@ -711,7 +711,7 @@ nsecs_t InputDispatcher::processAnrsLocked() {
		// Stop waking up for this unresponsive connection
		mAnrTracker.eraseToken(connection->inputChannel->getConnectionToken());
		onAnrLocked(connection);
		return LONG_LONG_MIN;
		return LLONG_MIN;
		}

		std::chrono::nanoseconds InputDispatcher::getDispatchingTimeoutLocked(
		@@ -918,7 +918,7 @@ void InputDispatcher::dispatchOnceInnerLocked(nsecs_t* nextWakeupTime) {
		mLastDropReason = dropReason;

		releasePendingEventLocked();
		*nextWakeupTime = LONG_LONG_MIN; // force next poll to wake up immediately
		*nextWakeupTime = LLONG_MIN; // force next poll to wake up immediately
		}
		}

		@@ -1201,11 +1201,11 @@ bool InputDispatcher::isAppSwitchKeyEvent(const KeyEntry& keyEntry) {
		}

		bool InputDispatcher::isAppSwitchPendingLocked() {
		return mAppSwitchDueTime != LONG_LONG_MAX;
		return mAppSwitchDueTime != LLONG_MAX;
		}

		void InputDispatcher::resetPendingAppSwitchLocked(bool handled) {
		mAppSwitchDueTime = LONG_LONG_MAX;
		mAppSwitchDueTime = LLONG_MAX;

		if (DEBUG_APP_SWITCH) {
		if (handled) {
		@@ -1498,7 +1498,7 @@ bool InputDispatcher::dispatchKeyLocked(nsecs_t currentTime, std::shared_ptr<Key
		// stop the key repeat on current device.
		entry->repeatCount = mKeyRepeatState.lastKeyEntry->repeatCount + 1;
		resetKeyRepeatLocked();
		mKeyRepeatState.nextRepeatTime = LONG_LONG_MAX; // don't generate repeats ourselves
		mKeyRepeatState.nextRepeatTime = LLONG_MAX; // don't generate repeats ourselves
		} else {
		// Not a repeat. Save key down state in case we do see a repeat later.
		resetKeyRepeatLocked();

services/inputflinger/reader/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ cc_defaults {
		host: {
		static_libs: [
		"libinput",
		"libbinder",
		],
		},
		},