summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2015-10-01 19:54:01 (GMT)
committerJorge Ruesga <jorge@ruesga.com>2015-10-01 19:54:01 (GMT)
commit14a18d5bb21661ab0acc2691832afb7b17d270ed (patch)
tree64648e9d39333a514b907130e9840b89690e0e7d
parent9d8ee9ea0196dd6dc6947dbee9e88742b7ae560e (diff)
downloadandroid_packages_apps_Trebuchet-14a18d5bb21661ab0acc2691832afb7b17d270ed.zip
android_packages_apps_Trebuchet-14a18d5bb21661ab0acc2691832afb7b17d270ed.tar.gz
android_packages_apps_Trebuchet-14a18d5bb21661ab0acc2691832afb7b17d270ed.tar.bz2
trebuchet: protect against npe
Change-Id: I14427057c4caf6e9d645944a4b1039343767d4d6 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r--src/com/android/launcher3/SearchDropTargetBar.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java
index 66a8518..e17ac0e 100644
--- a/src/com/android/launcher3/SearchDropTargetBar.java
+++ b/src/com/android/launcher3/SearchDropTargetBar.java
@@ -243,7 +243,7 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
mDropTargetBarAnim.reverse();
if (!isAnyFolderOpen() && (!mIsSearchBarHidden ||
(mQSBSearchBar != null && mQSBSearchBar.getAlpha() < 1f))) {
- if (mLauncher != null && mLauncher.shouldShowSearchBar()
+ if (mLauncher != null && mQSBSearchBar != null && mLauncher.shouldShowSearchBar()
&& mQSBSearchBar.getVisibility() != View.VISIBLE) {
mQSBSearchBar.setVisibility(View.VISIBLE);
}