summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fyodor Kupolov <fkupolov@google.com> 2017-08-14 21:16:10 +0000
committer android-build-merger <android-build-merger@google.com> 2017-08-14 21:16:10 +0000
commit31fe1bd711e6ebb83da7b295b30d4642516d557b (patch)
tree89064a50769e78a0bb76194794f7f7d0acca5761
parentf5a87f7058c00322c8f109fd2c81840664831dc0 (diff)
parent400fed43a5a9321c0083a9c6050f8f81fa89ee6d (diff)
Merge "Make SQLiteDirectCursorDriver @TestApi" into oc-mr1-dev am: 9b9d310a6d
am: 400fed43a5 Change-Id: I00d7c075f3ec1568e3979429ae25d04e9f121ff8
-rw-r--r--api/test-current.txt9
-rw-r--r--core/java/android/database/sqlite/SQLiteDirectCursorDriver.java2
2 files changed, 11 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt
index 36515a555c99..9ee25279e997 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -12070,6 +12070,15 @@ package android.database.sqlite {
field public int pageCacheOverflow;
}
+ public final class SQLiteDirectCursorDriver implements android.database.sqlite.SQLiteCursorDriver {
+ ctor public SQLiteDirectCursorDriver(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String, android.os.CancellationSignal);
+ method public void cursorClosed();
+ method public void cursorDeactivated();
+ method public void cursorRequeried(android.database.Cursor);
+ method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase.CursorFactory, java.lang.String[]);
+ method public void setBindArguments(java.lang.String[]);
+ }
+
public class SQLiteDiskIOException extends android.database.sqlite.SQLiteException {
ctor public SQLiteDiskIOException();
ctor public SQLiteDiskIOException(java.lang.String);
diff --git a/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java b/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java
index 797430a4c8ec..1721e0c69dc3 100644
--- a/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java
+++ b/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java
@@ -16,6 +16,7 @@
package android.database.sqlite;
+import android.annotation.TestApi;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase.CursorFactory;
import android.os.CancellationSignal;
@@ -25,6 +26,7 @@ import android.os.CancellationSignal;
*
* @hide
*/
+@TestApi
public final class SQLiteDirectCursorDriver implements SQLiteCursorDriver {
private final SQLiteDatabase mDatabase;
private final String mEditTable;