Skip to content

Commit 8ea8a29

Browse files
author
Jim Miller
committed
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
1 parent 38616cc commit 8ea8a29

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ private void startAssistActivity() {
109109
mBar.animateCollapse();
110110
// Launch Assist
111111
Intent intent = getAssistIntent();
112+
if (intent == null) return;
112113
try {
113114
ActivityOptions opts = ActivityOptions.makeCustomAnimation(mContext,
114115
R.anim.search_launch_enter, R.anim.search_launch_exit);

0 commit comments

Comments
 (0)