commit 7db7e6a00c5a0b38bb2077d93a009581941884d3
author Android (Google) Code Review <android-gerrit@google.com> Tue Sep 29 03:35:53 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 29 03:35:53 2009 -0400
tree d6307699b88b336a809da43bd4016988f6418c1b
parent 31522ad0ca71013ac5437a1a43e9078a31ff2213
parent 86917dbb9554e3e05be4ca8845a409b730120022

Merge change I17f45d35 into eclair

* changes:
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index d063ada..b2ed2e4 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -24317,6 +24317,17 @@
  visibility="public"
 >
 </field>
+<field name="SUGGEST_PARAMETER_LIMIT"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;limit&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SUGGEST_URI_PATH_QUERY"
  type="java.lang.String"
  transient="false"

core/java/android/app/SearchManager.java

diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java
index 9851750..ae33fad 100644
--- a/core/java/android/app/SearchManager.java
+++ b/core/java/android/app/SearchManager.java
@@ -1592,8 +1592,7 @@
 
     /**
      * Query parameter added to suggestion queries to limit the number of suggestions returned.
-     *
-     * @hide Pending API council approval
+     * This limit is only advisory and suggestion providers may chose to ignore it.
      */
     public final static String SUGGEST_PARAMETER_LIMIT = "limit";