Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 72fc14e8: am f83d9b3f: fix build breakage

Browse Source 
Merge commit '72fc14e874b53580420649b547c5fce1a8edc99c' into eclair-mr2-plus-aosp

* commit '72fc14e874b53580420649b547c5fce1a8edc99c':
  fix build breakage
This commit is contained in:
Fred Quintana
2009-10-06 14:50:45 -07:00
committed by Android Git Automerger
parent 11aaaa70b7 72fc14e874
commit 7a5262a620
2 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/current.xml
View File

@@ -27420,29 +27420,6 @@
<parameter name="orderBy" type="java.lang.String"> <parameter name="orderBy" type="java.lang.String">
</parameter> </parameter>
</method> </method>
<method name="startQueryEntities"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="token" type="int">
</parameter>
<parameter name="cookie" type="java.lang.Object">
</parameter>
<parameter name="uri" type="android.net.Uri">
</parameter>
<parameter name="selection" type="java.lang.String">
</parameter>
<parameter name="selectionArgs" type="java.lang.String[]">
</parameter>
<parameter name="orderBy" type="java.lang.String">
</parameter>
</method>
<method name="startUpdate" <method name="startUpdate"
return="void" return="void"
abstract="false" abstract="false"

1
core/java/android/content/AsyncQueryHandler.java
View File

@@ -213,6 +213,7 @@ public abstract class AsyncQueryHandler extends Handler {
* @param orderBy How to order the rows, formatted as an SQL ORDER BY clause * @param orderBy How to order the rows, formatted as an SQL ORDER BY clause
* (excluding the ORDER BY itself). Passing null will use the * (excluding the ORDER BY itself). Passing null will use the
* default sort order, which may be unordered. * default sort order, which may be unordered.
* @hide
*/ */
public void startQueryEntities(int token, Object cookie, Uri uri, String selection, public void startQueryEntities(int token, Object cookie, Uri uri, String selection,
String[] selectionArgs, String orderBy) { String[] selectionArgs, String orderBy) {