From e561a25542164f33a1c162830f97417924aaa91e Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Tue, 5 Mar 2013 16:50:31 -0800 Subject: [PATCH] check if searchmneu is null before using it --- .../com/google/android/apps/mytracks/MarkerListActivity.java | 2 +- .../com/google/android/apps/mytracks/SearchListActivity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java index c2fdc0730..e3955a4a4 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java @@ -297,7 +297,7 @@ public class MarkerListActivity extends AbstractMyTracksActivity implements Dele @Override public boolean onKeyUp(int keyCode, KeyEvent event) { - if (keyCode == KeyEvent.KEYCODE_SEARCH) { + if (keyCode == KeyEvent.KEYCODE_SEARCH && searchMenuItem != null) { if (ApiAdapterFactory.getApiAdapter().handleSearchKey(searchMenuItem)) { return true; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java index 9a35b4bf9..0f06b9980 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java @@ -307,7 +307,7 @@ public class SearchListActivity extends AbstractSendToGoogleActivity @Override public boolean onKeyUp(int keyCode, KeyEvent event) { - if (keyCode == KeyEvent.KEYCODE_SEARCH) { + if (keyCode == KeyEvent.KEYCODE_SEARCH && searchMenuItem != null) { if (ApiAdapterFactory.getApiAdapter().handleSearchKey(searchMenuItem)) { return true; }