Merge "Make setOn[Long]ClickListener() take a @Nullable argument" (a1c14fe9) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -4690,7 +4690,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* @see #setClickable(boolean)
		*/
		public void setOnClickListener(OnClickListener l) {
		public void setOnClickListener(@Nullable OnClickListener l) {
		if (!isClickable()) {
		setClickable(true);
		}
		@@ -4714,7 +4714,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* @see #setLongClickable(boolean)
		*/
		public void setOnLongClickListener(OnLongClickListener l) {
		public void setOnLongClickListener(@Nullable OnLongClickListener l) {
		if (!isLongClickable()) {
		setLongClickable(true);
		}