diff options
| author | Jim Miller <jaggies@google.com> | 2012-05-30 10:56:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-30 10:56:04 -0700 |
| commit | 1b4341a682bf0ef191be3dbb0ee1ef08036fe075 (patch) | |
| tree | 05493e70039154df8453fb3263e407b8ca90b55c /packages/SystemUI | |
| parent | 4d19ce609b229ff0bebb577746f8beac17011325 (diff) | |
| parent | a78bdd95b30ecdbd26e1b46c0d651b3975fea6b8 (diff) | |
| download | frameworks_base-1b4341a682bf0ef191be3dbb0ee1ef08036fe075.zip frameworks_base-1b4341a682bf0ef191be3dbb0ee1ef08036fe075.tar.gz frameworks_base-1b4341a682bf0ef191be3dbb0ee1ef08036fe075.tar.bz2 | |
am a78bdd95: Merge "Fix 6578735: don\'t crash system ui when there\'s no search activity" into jb-dev
* commit 'a78bdd95b30ecdbd26e1b46c0d651b3975fea6b8':
Fix 6578735: don't crash system ui when there's no search activity
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/SearchPanelView.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/SearchPanelView.java b/packages/SystemUI/src/com/android/systemui/SearchPanelView.java index 08d9842..af88a06 100644 --- 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); |