Merge "Delete the sqlite_apis_35 flag from frameworks/base" into main (d80cd594) · Commits · e / os / android_frameworks_base

core/api/current.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -15140,14 +15140,14 @@ package android.database.sqlite {
		public final class SQLiteDatabase extends android.database.sqlite.SQLiteClosable {
		method public void beginTransaction();
		method public void beginTransactionNonExclusive();
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public void beginTransactionReadOnly();
		method public void beginTransactionReadOnly();
		method public void beginTransactionWithListener(@Nullable android.database.sqlite.SQLiteTransactionListener);
		method public void beginTransactionWithListenerNonExclusive(@Nullable android.database.sqlite.SQLiteTransactionListener);
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public void beginTransactionWithListenerReadOnly(@Nullable android.database.sqlite.SQLiteTransactionListener);
		method public void beginTransactionWithListenerReadOnly(@Nullable android.database.sqlite.SQLiteTransactionListener);
		method public android.database.sqlite.SQLiteStatement compileStatement(String) throws android.database.SQLException;
		method @NonNull public static android.database.sqlite.SQLiteDatabase create(@Nullable android.database.sqlite.SQLiteDatabase.CursorFactory);
		method @NonNull public static android.database.sqlite.SQLiteDatabase createInMemory(@NonNull android.database.sqlite.SQLiteDatabase.OpenParams);
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") @NonNull public android.database.sqlite.SQLiteRawStatement createRawStatement(@NonNull String);
		method @NonNull public android.database.sqlite.SQLiteRawStatement createRawStatement(@NonNull String);
		method public int delete(@NonNull String, @Nullable String, @Nullable String[]);
		method public static boolean deleteDatabase(@NonNull java.io.File);
		method public void disableWriteAheadLogging();
		@@ -15158,13 +15158,13 @@ package android.database.sqlite {
		method public void execSQL(@NonNull String, @NonNull Object[]) throws android.database.SQLException;
		method public static String findEditTable(String);
		method public java.util.List<android.util.Pair<java.lang.String,java.lang.String>> getAttachedDbs();
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public long getLastChangedRowCount();
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public long getLastInsertRowId();
		method public long getLastChangedRowCount();
		method public long getLastInsertRowId();
		method public long getMaximumSize();
		method public long getPageSize();
		method public String getPath();
		method @Deprecated public java.util.Map<java.lang.String,java.lang.String> getSyncedTables();
		method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public long getTotalChangedRowCount();
		method public long getTotalChangedRowCount();
		method public int getVersion();
		method public boolean inTransaction();
		method public long insert(@NonNull String, @Nullable String, @Nullable android.content.ContentValues);
		@@ -15386,7 +15386,7 @@ package android.database.sqlite {
		method public int update(@NonNull android.database.sqlite.SQLiteDatabase, @NonNull android.content.ContentValues, @Nullable String, @Nullable String[]);
		}

		@FlaggedApi("android.database.sqlite.sqlite_apis_35") public final class SQLiteRawStatement implements java.io.Closeable {
		public final class SQLiteRawStatement implements java.io.Closeable {
		method public void bindBlob(int, @NonNull byte[]);
		method public void bindBlob(int, @NonNull byte[], int, int);
		method public void bindDouble(int, double);

core/java/android/database/sqlite/SQLiteDatabase.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -731,7 +731,6 @@ public final class SQLiteDatabase extends SQLiteClosable {
		* }
		* </pre>
		*/
		@FlaggedApi(Flags.FLAG_SQLITE_APIS_35)
		public void beginTransactionReadOnly() {
		beginTransactionWithListenerReadOnly(null);
		}
		@@ -818,7 +817,6 @@ public final class SQLiteDatabase extends SQLiteClosable {
		* </pre>
		*/
		@SuppressLint("ExecutorRegistration")
		@FlaggedApi(Flags.FLAG_SQLITE_APIS_35)
		public void beginTransactionWithListenerReadOnly(
		@Nullable SQLiteTransactionListener transactionListener) {
		beginTransaction(transactionListener, SQLiteSession.TRANSACTION_MODE_DEFERRED);
		@@ -2257,7 +2255,6 @@ public final class SQLiteDatabase extends SQLiteClosable {
		* @throws IllegalStateException if a transaction is not in progress.
		* @throws SQLiteException if the SQL cannot be compiled.
		*/
		@FlaggedApi(Flags.FLAG_SQLITE_APIS_35)
		@NonNull
		public SQLiteRawStatement createRawStatement(@NonNull String sql) {
		Objects.requireNonNull(sql);
		@@ -2277,7 +2274,6 @@ public final class SQLiteDatabase extends SQLiteClosable {
		* @return The ROWID of the last row to be inserted under this connection.
		* @throws IllegalStateException if there is no current transaction.
		*/
		@FlaggedApi(Flags.FLAG_SQLITE_APIS_35)
		public long getLastInsertRowId() {
		return getThreadSession().getLastInsertRowId();
		}
		@@ -2291,7 +2287,6 @@ public final class SQLiteDatabase extends SQLiteClosable {
		* @return The number of rows changed by the most recent sql statement
		* @throws IllegalStateException if there is no current transaction.
		*/
		@FlaggedApi(Flags.FLAG_SQLITE_APIS_35)
		public long getLastChangedRowCount() {
		return getThreadSession().getLastChangedRowCount();
		}
		@@ -2319,7 +2314,6 @@ public final class SQLiteDatabase extends SQLiteClosable {
		* @return The number of rows changed on the current connection.
		* @throws IllegalStateException if there is no current transaction.
		*/
		@FlaggedApi(Flags.FLAG_SQLITE_APIS_35)
		public long getTotalChangedRowCount() {
		return getThreadSession().getTotalChangedRowCount();
		}

core/java/android/database/sqlite/SQLiteRawStatement.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ import java.util.Objects;
		*
		* @see <a href="http://sqlite.org/c3ref/stmt.html">sqlite3_stmt</a>
		*/
		@FlaggedApi(Flags.FLAG_SQLITE_APIS_35)
		public final class SQLiteRawStatement implements Closeable {

		private static final String TAG = "SQLiteRawStatement";