Merge commit '82415bed3478a3a2200386691f05d671b46568f5' into honeycomb-release (d17b2861) · Commits · e / os / platform_frameworks_native

include/ui/KeycodeLabels.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -188,6 +188,7 @@ static const KeycodeLabel KEYCODES[] = {
		{ "NUMPAD_EQUALS", 161 },
		{ "NUMPAD_LEFT_PAREN", 162 },
		{ "NUMPAD_RIGHT_PAREN", 163 },
		{ "VOLUME_MUTE", 164 },

		// NOTE: If you add a new keycode here you must also add it to several other files.
		// Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

libs/ui/Input.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ bool KeyEvent::hasDefaultAction(int32_t keyCode) {
		case AKEYCODE_ENDCALL:
		case AKEYCODE_VOLUME_UP:
		case AKEYCODE_VOLUME_DOWN:
		case AKEYCODE_VOLUME_MUTE:
		case AKEYCODE_POWER:
		case AKEYCODE_CAMERA:
		case AKEYCODE_HEADSETHOOK:
		@@ -40,11 +41,14 @@ bool KeyEvent::hasDefaultAction(int32_t keyCode) {
		case AKEYCODE_NOTIFICATION:
		case AKEYCODE_FOCUS:
		case AKEYCODE_SEARCH:
		case AKEYCODE_MEDIA_PLAY:
		case AKEYCODE_MEDIA_PAUSE:
		case AKEYCODE_MEDIA_PLAY_PAUSE:
		case AKEYCODE_MEDIA_STOP:
		case AKEYCODE_MEDIA_NEXT:
		case AKEYCODE_MEDIA_PREVIOUS:
		case AKEYCODE_MEDIA_REWIND:
		case AKEYCODE_MEDIA_RECORD:
		case AKEYCODE_MEDIA_FAST_FORWARD:
		case AKEYCODE_MUTE:
		return true;
		@@ -67,14 +71,18 @@ bool KeyEvent::isSystemKey(int32_t keyCode) {
		case AKEYCODE_ENDCALL:
		case AKEYCODE_VOLUME_UP:
		case AKEYCODE_VOLUME_DOWN:
		case AKEYCODE_VOLUME_MUTE:
		case AKEYCODE_MUTE:
		case AKEYCODE_POWER:
		case AKEYCODE_HEADSETHOOK:
		case AKEYCODE_MEDIA_PLAY:
		case AKEYCODE_MEDIA_PAUSE:
		case AKEYCODE_MEDIA_PLAY_PAUSE:
		case AKEYCODE_MEDIA_STOP:
		case AKEYCODE_MEDIA_NEXT:
		case AKEYCODE_MEDIA_PREVIOUS:
		case AKEYCODE_MEDIA_REWIND:
		case AKEYCODE_MEDIA_RECORD:
		case AKEYCODE_MEDIA_FAST_FORWARD:
		case AKEYCODE_CAMERA:
		case AKEYCODE_FOCUS:

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/Region.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -289,7 +289,7 @@ private:
		void flushSpan() {
		bool merge = false;
		if (tail-head == ssize_t(span.size())) {
		Rect const* p = cur;
		Rect const* p = span.editArray();
		Rect const* q = head;
		if (p->top == q->bottom) {
		merge = true;

libs/utils/ResourceTypes.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1949,7 +1949,7 @@ ssize_t ResTable::getResource(uint32_t resID, Res_value* outValue, bool mayBeBag
		desiredConfig = overrideConfig;
		}

		ssize_t rc = BAD_INDEX;
		ssize_t rc = BAD_VALUE;
		size_t ip = grp->packages.size();
		while (ip > 0) {
		ip--;