Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread (37cc46a0) · Commits · e / os / platform_frameworks_native

libs/ui/InputDispatcher.cpp

+15 −1

Original line number	Diff line number	Diff line
		@@ -1405,8 +1405,13 @@ String8 InputDispatcher::getApplicationWindowLabelLocked(const InputApplication*

		void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) {
		int32_t eventType = POWER_MANAGER_BUTTON_EVENT;
		if (eventEntry->type == EventEntry::TYPE_MOTION) {
		switch (eventEntry->type) {
		case EventEntry::TYPE_MOTION: {
		const MotionEntry* motionEntry = static_cast<const MotionEntry*>(eventEntry);
		if (motionEntry->action == AMOTION_EVENT_ACTION_CANCEL) {
		return;
		}

		if (motionEntry->source & AINPUT_SOURCE_CLASS_POINTER) {
		switch (motionEntry->action) {
		case AMOTION_EVENT_ACTION_DOWN:
		@@ -1424,6 +1429,15 @@ void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) {
		break;
		}
		}
		break;
		}
		case EventEntry::TYPE_KEY: {
		const KeyEntry* keyEntry = static_cast<const KeyEntry*>(eventEntry);
		if (keyEntry->flags & AKEY_EVENT_FLAG_CANCELED) {
		return;
		}
		break;
		}
		}

		CommandEntry* commandEntry = postCommandLocked(