summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Bringert <bringert@android.com>2009-09-19 11:01:12 +0100
committerBjorn Bringert <bringert@android.com>2009-09-21 20:28:28 +0100
commit2f2daf8ed4d45ff68a0aeffcd0b284c45e5a5d82 (patch)
treec8940afe700f9aa08d7f26b52c22181310f784a9
parent3dc0f94cd44df2f9310946b0a0a1c7f8c6d95af5 (diff)
downloadframeworks_base-2f2daf8ed4d45ff68a0aeffcd0b284c45e5a5d82.zip
frameworks_base-2f2daf8ed4d45ff68a0aeffcd0b284c45e5a5d82.tar.gz
frameworks_base-2f2daf8ed4d45ff68a0aeffcd0b284c45e5a5d82.tar.bz2
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.
-rw-r--r--core/java/android/app/SearchDialog.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index 5844079..3e93ec7 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,