Merge "Negate condition to reduce nesting in InputDispatcher" (1bb1eb01) · Commits · e / os / android_frameworks_native

services/inputflinger/InputDispatcher.cpp

+132 −130

Original line number	Original line	Diff line number	Diff line
	@@ -4024,7 +4024,10 @@ void InputDispatcher::doDispatchCycleFinishedLockedInterruptible(

	bool InputDispatcher::afterKeyEventLockedInterruptible(const sp<Connection>& connection,		bool InputDispatcher::afterKeyEventLockedInterruptible(const sp<Connection>& connection,
	DispatchEntry* dispatchEntry, KeyEntry* keyEntry, bool handled) {		DispatchEntry* dispatchEntry, KeyEntry* keyEntry, bool handled) {
	if (!(keyEntry->flags & AKEY_EVENT_FLAG_FALLBACK)) {		if (keyEntry->flags & AKEY_EVENT_FLAG_FALLBACK) {
			return false;
			}

	// Get the fallback key state.		// Get the fallback key state.
	// Clear it out after dispatching the UP.		// Clear it out after dispatching the UP.
	int32_t originalKeyCode = keyEntry->keyCode;		int32_t originalKeyCode = keyEntry->keyCode;
	@@ -4191,7 +4194,6 @@ bool InputDispatcher::afterKeyEventLockedInterruptible(const sp<Connection>& con
	#endif		#endif
	}		}
	}		}
	}
	return false;		return false;
	}		}