diff options
| author | Gabriele M <moto.falcon.git@gmail.com> | 2016-01-16 00:10:32 +0100 |
|---|---|---|
| committer | Gabriele M <moto.falcon.git@gmail.com> | 2016-01-16 01:32:21 +0100 |
| commit | ab66f216141753ce2696c136fb9bee8c73c471a5 (patch) | |
| tree | ef558285b0bb725fc24177d651715c57b738f5ea /src | |
| parent | fb312defb7f570d2e3a6ed2357735759c647cb8b (diff) | |
| download | android_packages_apps_Trebuchet-ab66f216141753ce2696c136fb9bee8c73c471a5.tar.gz android_packages_apps_Trebuchet-ab66f216141753ce2696c136fb9bee8c73c471a5.tar.bz2 android_packages_apps_Trebuchet-ab66f216141753ce2696c136fb9bee8c73c471a5.zip | |
Trebuchet: Fix NPE when app search controller is off
Change-Id: Ia6a9322e0aee3e16d4dd864fbc5a341e3f0501a8
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 18030b451..0e3cba83e 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -502,7 +502,8 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc public boolean dispatchKeyEvent(KeyEvent event) { // Determine if the key event was actual text, if so, focus the search bar and then dispatch // the key normally so that it can process this key event - if (!mSearchBarController.isSearchFieldFocused() && + if (mSearchBarController != null && + !mSearchBarController.isSearchFieldFocused() && event.getAction() == KeyEvent.ACTION_DOWN) { final int unicodeChar = event.getUnicodeChar(); final boolean isKeyNotWhitespace = unicodeChar > 0 && |