summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2015-10-01 21:54:01 +0200
committerJorge Ruesga <jorge@ruesga.com>2015-10-01 13:15:12 -0700
commitb5f95bfc7e7825e295a5311cd381005500a2408b (patch)
tree08a734de057f7fc4132e54f382de25bd537794bf
parent3dcc42db10a15014e861b2ff53d39b01bffbb80d (diff)
downloadandroid_packages_apps_Trebuchet-b5f95bfc7e7825e295a5311cd381005500a2408b.tar.gz
android_packages_apps_Trebuchet-b5f95bfc7e7825e295a5311cd381005500a2408b.tar.bz2
android_packages_apps_Trebuchet-b5f95bfc7e7825e295a5311cd381005500a2408b.zip
trebuchet: protect against npe
CYNGNOS-1146 Change-Id: I14427057c4caf6e9d645944a4b1039343767d4d6 Signed-off-by: Jorge Ruesga <jorge@ruesga.com> (cherry picked from commit 14a18d5bb21661ab0acc2691832afb7b17d270ed)
-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 66a85188e..e17ac0e3d 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);
}