Merge "Use copied input events in TvView" (46897108) · Commits · e / os / android_frameworks_base

core/java/android/tv/TvView.java

+12 −4

Original line number	Original line	Diff line number	Diff line
	@@ -196,7 +196,9 @@ public class TvView extends SurfaceView {
	if (mSession == null) {		if (mSession == null) {
	return false;		return false;
	}		}
	int ret = mSession.dispatchInputEvent(event, event, mFinishedInputEventCallback, mHandler);		InputEvent copiedEvent = event.copy();
			int ret = mSession.dispatchInputEvent(copiedEvent, copiedEvent, mFinishedInputEventCallback,
			mHandler);
	return ret != Session.DISPATCH_NOT_HANDLED;		return ret != Session.DISPATCH_NOT_HANDLED;
	}		}

	@@ -209,7 +211,9 @@ public class TvView extends SurfaceView {
	if (mSession == null) {		if (mSession == null) {
	return false;		return false;
	}		}
	int ret = mSession.dispatchInputEvent(event, event, mFinishedInputEventCallback, mHandler);		InputEvent copiedEvent = event.copy();
			int ret = mSession.dispatchInputEvent(copiedEvent, copiedEvent, mFinishedInputEventCallback,
			mHandler);
	return ret != Session.DISPATCH_NOT_HANDLED;		return ret != Session.DISPATCH_NOT_HANDLED;
	}		}

	@@ -222,7 +226,9 @@ public class TvView extends SurfaceView {
	if (mSession == null) {		if (mSession == null) {
	return false;		return false;
	}		}
	int ret = mSession.dispatchInputEvent(event, event, mFinishedInputEventCallback, mHandler);		InputEvent copiedEvent = event.copy();
			int ret = mSession.dispatchInputEvent(copiedEvent, copiedEvent, mFinishedInputEventCallback,
			mHandler);
	return ret != Session.DISPATCH_NOT_HANDLED;		return ret != Session.DISPATCH_NOT_HANDLED;
	}		}

	@@ -235,7 +241,9 @@ public class TvView extends SurfaceView {
	if (mSession == null) {		if (mSession == null) {
	return false;		return false;
	}		}
	int ret = mSession.dispatchInputEvent(event, event, mFinishedInputEventCallback, mHandler);		InputEvent copiedEvent = event.copy();
			int ret = mSession.dispatchInputEvent(copiedEvent, copiedEvent, mFinishedInputEventCallback,
			mHandler);
	return ret != Session.DISPATCH_NOT_HANDLED;		return ret != Session.DISPATCH_NOT_HANDLED;
	}		}