Merge "Fix 6578735: don't crash system ui when there's no search activity" into jb-dev

Author: Jim Miller

packages/SystemUI/src/com/android/systemui/SearchPanelView.java

@@ -110,6 +110,7 @@ private void startAssistActivity() {
         mBar.animateCollapse(CommandQueue.FLAG_EXCLUDE_SEARCH_PANEL);
         // 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);