Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent NPE for onKeyDown and onKeyUp" into tm-dev am: b1c7853e29

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17130385

Change-Id: Ic371b641794e6cde37ff8b6a4f2f3547152227a5
This commit is contained in:
Arthur Hung
2022-03-15 14:48:29 +00:00
committed by Automerger Merge Worker
parent d725189d7b b1c7853e29
commit dc76d7d337
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/View.java
View File

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