Merge "Remove 2 goto statements for wrongDevice" (c3e73cbf) · Commits · e / devices / smdk4412 / android_frameworks_native

services/inputflinger/dispatcher/InputDispatcher.cpp

+65 −67

Original line number	Diff line number	Diff line
		@@ -2084,7 +2084,7 @@ std::vector<TouchedWindow> InputDispatcher::findTouchedWindowTargetsLocked(
		outInjectionResult = InputEventInjectionResult::FAILED;
		switchedDevice = false;
		wrongDevice = true;
		goto Failed;
		return touchedWindows;
		}
		tempTouchState.reset();
		tempTouchState.down = down;
		@@ -2100,7 +2100,7 @@ std::vector<TouchedWindow> InputDispatcher::findTouchedWindowTargetsLocked(
		outInjectionResult = InputEventInjectionResult::FAILED;
		switchedDevice = false;
		wrongDevice = true;
		goto Failed;
		return touchedWindows;
		}

		if (newGesture \|\| (isSplit && maskedAction == AMOTION_EVENT_ACTION_POINTER_DOWN)) {
		@@ -2412,7 +2412,6 @@ std::vector<TouchedWindow> InputDispatcher::findTouchedWindowTargetsLocked(

		Failed:
		// Update final pieces of touch state if the injector had permission.
		if (!wrongDevice) {
		if (switchedDevice) {
		if (DEBUG_FOCUS) {
		ALOGD("Conflicting pointer actions: Switched to a different device.");
		@@ -2487,7 +2486,6 @@ Failed:

		// Update hover state.
		mLastHoverWindowHandle = newHoverWindowHandle;
		}

		return touchedWindows;
		}