From 8ea8a29de70e0ed66788b13d621788aa6d398ded Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Wed, 30 May 2012 09:50:00 -0700
Subject: [PATCH] Fix 6578735: don't crash system ui when there's no search
 activity

Because SearchPanelView tracks input even when it's not showing, it
was possible to trigger search with a gesture.

Change-Id: I60f654d279d2ff1799d8a4b69796da8c7e81f3c7
---
 packages/SystemUI/src/com/android/systemui/SearchPanelView.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/SystemUI/src/com/android/systemui/SearchPanelView.java b/packages/SystemUI/src/com/android/systemui/SearchPanelView.java
index 060d08e090ad..0747c376e63d 100644
--- a/packages/SystemUI/src/com/android/systemui/SearchPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/SearchPanelView.java
@@ -109,6 +109,7 @@ public class SearchPanelView extends FrameLayout implements
         mBar.animateCollapse();
         // Launch Assist
         Intent intent = getAssistIntent();
+        if (intent == null) return;
         try {
             ActivityOptions opts = ActivityOptions.makeCustomAnimation(mContext,
                     R.anim.search_launch_enter, R.anim.search_launch_exit);
-- 
2.11.0