Merge change 25918 into eclair

* changes: Set intent_component of in-app shortcuts to app itself
2009-09-21 05:02:18 -04:00
parent 5feb428f34 0e62e2df36
commit f97f436ed6
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -1218,7 +1218,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,