From a42f095cefdd53a12f20872c1de7809ed7db0740 Mon Sep 17 00:00:00 2001 From: Simon MacDonald Date: Tue, 11 Sep 2012 09:04:42 -0400 Subject: [PATCH] CB-1409: Clicking the menu button crashes Jellybean --- framework/src/org/apache/cordova/DroidGap.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java index 2b70e8a8..9827ed53 100755 --- a/framework/src/org/apache/cordova/DroidGap.java +++ b/framework/src/org/apache/cordova/DroidGap.java @@ -1001,10 +1001,10 @@ public class DroidGap extends Activity implements CordovaInterface { public boolean onKeyUp(int keyCode, KeyEvent event) { //Determine if the focus is on the current view or not - if(appView.getHitTestResult().getType() == WebView.HitTestResult.EDIT_TEXT_TYPE && - keyCode == KeyEvent.KEYCODE_BACK) - { - return appView.onKeyUp(keyCode, event); + if (appView.getHitTestResult() != null && + appView.getHitTestResult().getType() == WebView.HitTestResult.EDIT_TEXT_TYPE && + keyCode == KeyEvent.KEYCODE_BACK) { + return appView.onKeyUp(keyCode, event); } else return super.onKeyUp(keyCode, event);