From 2f2daf8ed4d45ff68a0aeffcd0b284c45e5a5d82 Mon Sep 17 00:00:00 2001 From: Bjorn Bringert Date: Sat, 19 Sep 2009 11:01:12 +0100 Subject: [PATCH] Fix search intent component bug DO NOT MERGE This is the Donut version of the fix for http://b/issue?id=2130474 "Shortcuts created by pivoted-in search do not have intent_component_name set" This fix is already in Eclair, so it should not be automerged. --- core/java/android/app/SearchDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java index 5844079e616cb..3e93ec71e3b75 100644 --- a/core/java/android/app/SearchDialog.java +++ b/core/java/android/app/SearchDialog.java @@ -1206,7 +1206,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS cv.put(SearchManager.SUGGEST_COLUMN_INTENT_ACTION, intent.getAction()); cv.put(SearchManager.SUGGEST_COLUMN_INTENT_DATA, intent.getDataString()); cv.put(SearchManager.SUGGEST_COLUMN_INTENT_COMPONENT_NAME, - intent.getStringExtra(SearchManager.COMPONENT_NAME_KEY)); + intent.getComponent().flattenToShortString()); // ensure the icons will work for global search cv.put(SearchManager.SUGGEST_COLUMN_ICON_1,