Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a78bdd95 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

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

parents 6c66e984 8ea8a29d

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

+1 −0
Original line number Diff line number Diff line
@@ -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);