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

2012-05-30 10:53:15 -07:00
parent 6c66e9842e 8ea8a29de7
commit a78bdd95b3
1 changed files with 1 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/SearchPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/SearchPanelView.java
@@ -110,6 +110,7 @@ public class SearchPanelView extends FrameLayout implements
        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);