Merge "Prevent NPE for onKeyDown and onKeyUp" into tm-dev (b1c7853e) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15616,7 +15616,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	* @param event the KeyEvent object that defines the button action		* @param event the KeyEvent object that defines the button action
	*/		*/
	public boolean onKeyDown(int keyCode, KeyEvent event) {		public boolean onKeyDown(int keyCode, KeyEvent event) {
	if (event.hasNoModifiers() && KeyEvent.isConfirmKey(keyCode)) {		if (KeyEvent.isConfirmKey(keyCode) && event.hasNoModifiers()) {
	if ((mViewFlags & ENABLED_MASK) == DISABLED) {		if ((mViewFlags & ENABLED_MASK) == DISABLED) {
	return true;		return true;
	}		}
	@@ -15673,7 +15673,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	* @param event The KeyEvent object that defines the button action.		* @param event The KeyEvent object that defines the button action.
	*/		*/
	public boolean onKeyUp(int keyCode, KeyEvent event) {		public boolean onKeyUp(int keyCode, KeyEvent event) {
	if (event.hasNoModifiers() && KeyEvent.isConfirmKey(keyCode)) {		if (KeyEvent.isConfirmKey(keyCode) && event.hasNoModifiers()) {
	if ((mViewFlags & ENABLED_MASK) == DISABLED) {		if ((mViewFlags & ENABLED_MASK) == DISABLED) {
	return true;		return true;
	}		}