diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-01 14:50:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-01 14:50:26 -0700 |
| commit | c17f16e33a0fca7efa10e758a526cd8d5d3a31f3 (patch) | |
| tree | 95371133e40db054f8ac4baed07ba94b7c1b29bd /core/java/android/app/SearchManager.java | |
| parent | b249890bc6740531898d94aaecac34d5736106bc (diff) | |
| parent | 21fd5f144a3e6919ff6b4e8a1a733c940d5dd6df (diff) | |
| download | frameworks_base-c17f16e33a0fca7efa10e758a526cd8d5d3a31f3.zip frameworks_base-c17f16e33a0fca7efa10e758a526cd8d5d3a31f3.tar.gz frameworks_base-c17f16e33a0fca7efa10e758a526cd8d5d3a31f3.tar.bz2 | |
Merge change 2851 into donut
* changes:
Change comment for SUGGEST_COLUMN_INTENT_EXTRA_DATA to clarify that this column is for use by global search only.
Diffstat (limited to 'core/java/android/app/SearchManager.java')
| -rw-r--r-- | core/java/android/app/SearchManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index 3bf37c3..be2f50f 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -1302,9 +1302,10 @@ public class SearchManager /** * Column name for suggestions cursor. <i>Optional.</i> This column allows suggestions * to provide additional arbitrary data which will be included as an extra under the key - * {@link #EXTRA_DATA_KEY}. + * {@link #EXTRA_DATA_KEY}. For use by the global search system only - if other providers + * attempt to use this column, the value will be overwritten by global search. * - * @hide pending API council approval + * @hide */ public final static String SUGGEST_COLUMN_INTENT_EXTRA_DATA = "suggest_intent_extra_data"; /** |