Merge remote branch 'ohd/gingerbread' into merge (1c79a55b) · Commits · e / os / android_frameworks_native-old

libs/ui/InputDispatcher.cpp

+40 −40

Original line number	Diff line number	Diff line
		@@ -619,38 +619,8 @@ bool InputDispatcher::dispatchConfigurationChangedLocked(
		bool InputDispatcher::dispatchKeyLocked(
		nsecs_t currentTime, KeyEntry* entry, nsecs_t keyRepeatTimeout,
		DropReason* dropReason, nsecs_t* nextWakeupTime) {
		// Give the policy a chance to intercept the key.
		if (entry->interceptKeyResult == KeyEntry::INTERCEPT_KEY_RESULT_UNKNOWN) {
		if (entry->policyFlags & POLICY_FLAG_PASS_TO_USER) {
		CommandEntry* commandEntry = postCommandLocked(
		& InputDispatcher::doInterceptKeyBeforeDispatchingLockedInterruptible);
		if (mFocusedWindow) {
		commandEntry->inputChannel = mFocusedWindow->inputChannel;
		}
		commandEntry->keyEntry = entry;
		entry->refCount += 1;
		return false; // wait for the command to run
		} else {
		entry->interceptKeyResult = KeyEntry::INTERCEPT_KEY_RESULT_CONTINUE;
		}
		} else if (entry->interceptKeyResult == KeyEntry::INTERCEPT_KEY_RESULT_SKIP) {
		if (*dropReason == DROP_REASON_NOT_DROPPED) {
		*dropReason = DROP_REASON_POLICY;
		}
		}

		// Clean up if dropping the event.
		if (*dropReason != DROP_REASON_NOT_DROPPED) {
		resetTargetsLocked();
		setInjectionResultLocked(entry, *dropReason == DROP_REASON_POLICY
		? INPUT_EVENT_INJECTION_SUCCEEDED : INPUT_EVENT_INJECTION_FAILED);
		return true;
		}

		// Preprocessing.
		if (! entry->dispatchInProgress) {
		logOutboundKeyDetailsLocked("dispatchKey - ", entry);

		if (entry->repeatCount == 0
		&& entry->action == AKEY_EVENT_ACTION_DOWN
		&& (entry->policyFlags & POLICY_FLAG_TRUSTED)
		@@ -677,6 +647,36 @@ bool InputDispatcher::dispatchKeyLocked(

		entry->dispatchInProgress = true;
		resetTargetsLocked();

		logOutboundKeyDetailsLocked("dispatchKey - ", entry);
		}

		// Give the policy a chance to intercept the key.
		if (entry->interceptKeyResult == KeyEntry::INTERCEPT_KEY_RESULT_UNKNOWN) {
		if (entry->policyFlags & POLICY_FLAG_PASS_TO_USER) {
		CommandEntry* commandEntry = postCommandLocked(
		& InputDispatcher::doInterceptKeyBeforeDispatchingLockedInterruptible);
		if (mFocusedWindow) {
		commandEntry->inputChannel = mFocusedWindow->inputChannel;
		}
		commandEntry->keyEntry = entry;
		entry->refCount += 1;
		return false; // wait for the command to run
		} else {
		entry->interceptKeyResult = KeyEntry::INTERCEPT_KEY_RESULT_CONTINUE;
		}
		} else if (entry->interceptKeyResult == KeyEntry::INTERCEPT_KEY_RESULT_SKIP) {
		if (*dropReason == DROP_REASON_NOT_DROPPED) {
		*dropReason = DROP_REASON_POLICY;
		}
		}

		// Clean up if dropping the event.
		if (*dropReason != DROP_REASON_NOT_DROPPED) {
		resetTargetsLocked();
		setInjectionResultLocked(entry, *dropReason == DROP_REASON_POLICY
		? INPUT_EVENT_INJECTION_SUCCEEDED : INPUT_EVENT_INJECTION_FAILED);
		return true;
		}

		// Identify targets.
		@@ -705,16 +705,24 @@ void InputDispatcher::logOutboundKeyDetailsLocked(const char* prefix, const KeyE
		#if DEBUG_OUTBOUND_EVENT_DETAILS
		LOGD("%seventTime=%lld, deviceId=0x%x, source=0x%x, policyFlags=0x%x, "
		"action=0x%x, flags=0x%x, keyCode=0x%x, scanCode=0x%x, metaState=0x%x, "
		"downTime=%lld",
		"repeatCount=%d, downTime=%lld",
		prefix,
		entry->eventTime, entry->deviceId, entry->source, entry->policyFlags,
		entry->action, entry->flags, entry->keyCode, entry->scanCode, entry->metaState,
		entry->downTime);
		entry->repeatCount, entry->downTime);
		#endif
		}

		bool InputDispatcher::dispatchMotionLocked(
		nsecs_t currentTime, MotionEntry* entry, DropReason* dropReason, nsecs_t* nextWakeupTime) {
		// Preprocessing.
		if (! entry->dispatchInProgress) {
		entry->dispatchInProgress = true;
		resetTargetsLocked();

		logOutboundMotionDetailsLocked("dispatchMotion - ", entry);
		}

		// Clean up if dropping the event.
		if (*dropReason != DROP_REASON_NOT_DROPPED) {
		resetTargetsLocked();
		@@ -723,14 +731,6 @@ bool InputDispatcher::dispatchMotionLocked(
		return true;
		}

		// Preprocessing.
		if (! entry->dispatchInProgress) {
		logOutboundMotionDetailsLocked("dispatchMotion - ", entry);

		entry->dispatchInProgress = true;
		resetTargetsLocked();
		}

		bool isPointerEvent = entry->source & AINPUT_SOURCE_CLASS_POINTER;

		// Identify targets.

libs/ui/InputReader.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -934,7 +934,7 @@ void KeyboardInputMapper::processKey(nsecs_t when, bool down, int32_t keyCode,
		ssize_t keyDownIndex = findKeyDownLocked(scanCode);
		if (keyDownIndex >= 0) {
		// key repeat, be sure to use same keycode as before in case of rotation
		keyCode = mLocked.keyDowns.top().keyCode;
		keyCode = mLocked.keyDowns.itemAt(keyDownIndex).keyCode;
		} else {
		// key down
		mLocked.keyDowns.push();
		@@ -949,7 +949,7 @@ void KeyboardInputMapper::processKey(nsecs_t when, bool down, int32_t keyCode,
		ssize_t keyDownIndex = findKeyDownLocked(scanCode);
		if (keyDownIndex >= 0) {
		// key up, be sure to use same keycode as before in case of rotation
		keyCode = mLocked.keyDowns.top().keyCode;
		keyCode = mLocked.keyDowns.itemAt(keyDownIndex).keyCode;
		mLocked.keyDowns.removeAt(size_t(keyDownIndex));
		} else {
		// key was not actually down