From 14a18d5bb21661ab0acc2691832afb7b17d270ed Mon Sep 17 00:00:00 2001 From: Jorge Ruesga Date: Thu, 1 Oct 2015 21:54:01 +0200 Subject: trebuchet: protect against npe Change-Id: I14427057c4caf6e9d645944a4b1039343767d4d6 Signed-off-by: Jorge Ruesga --- src/com/android/launcher3/SearchDropTargetBar.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } -- cgit v1.2.3