Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f8ce01d authored by Lee Shombert's avatar Lee Shombert
Browse files

Rename the SQLite flag 

Rename 'sqlite_apis_15' (APIs meant for Android 15) to
'sqlite_apis_35' (APIs meant for Android API level 35).

Bug: 301713419
Change-Id: I49554ffa25bc3ca5143ed225e134931c074b501d
parent ad48a441

core/api/current.txt

+7 −7
Original line number Diff line number Diff line
@@ -14352,14 +14352,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_15") public void beginTransactionReadOnly();

    method @FlaggedApi("android.database.sqlite.sqlite_apis_35") 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_15") public void beginTransactionWithListenerReadOnly(@Nullable android.database.sqlite.SQLiteTransactionListener);

    method @FlaggedApi("android.database.sqlite.sqlite_apis_35") 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_15") @NonNull public android.database.sqlite.SQLiteRawStatement createRawStatement(@NonNull String);

    method @FlaggedApi("android.database.sqlite.sqlite_apis_35") @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();
@@ -14370,13 +14370,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_15") public long getLastChangedRowCount();

    method @FlaggedApi("android.database.sqlite.sqlite_apis_15") public long getLastInsertRowId();

    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 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_15") public long getTotalChangedRowCount();

    method @FlaggedApi("android.database.sqlite.sqlite_apis_35") public long getTotalChangedRowCount();

    method public int getVersion();

    method public boolean inTransaction();

    method public long insert(@NonNull String, @Nullable String, @Nullable android.content.ContentValues);
@@ -14598,7 +14598,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_15") public final class SQLiteRawStatement implements java.io.Closeable {













  @FlaggedApi("android.database.sqlite.sqlite_apis_35") public final class SQLiteRawStatement implements java.io.Closeable {















    method public void bindBlob(int, @NonNull byte[]) throws android.database.sqlite.SQLiteException;















    method public void bindBlob(int, @NonNull byte[], int, int) throws android.database.sqlite.SQLiteException;















    method public void bindDouble(int, double) throws android.database.sqlite.SQLiteException;

























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



+6
−6




























Original line number
Diff line number
Diff line








@@ -701,7 +701,7 @@ public final class SQLiteDatabase extends SQLiteClosable {













     *   }















     * </pre>















     */













    @FlaggedApi(Flags.FLAG_SQLITE_APIS_15)













    @FlaggedApi(Flags.FLAG_SQLITE_APIS_35)















    public void beginTransactionReadOnly() {















        beginTransactionWithListenerReadOnly(null);















    }










@@ -785,7 +785,7 @@ public final class SQLiteDatabase extends SQLiteClosable {













     *   }















     * </pre>















     */













    @FlaggedApi(Flags.FLAG_SQLITE_APIS_15)













    @FlaggedApi(Flags.FLAG_SQLITE_APIS_35)















    public void beginTransactionWithListenerReadOnly(















            @Nullable SQLiteTransactionListener transactionListener) {















        beginTransaction(transactionListener, SQLiteSession.TRANSACTION_MODE_DEFERRED);










@@ -2224,7 +2224,7 @@ 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_15)













    @FlaggedApi(Flags.FLAG_SQLITE_APIS_35)















    @NonNull















    public SQLiteRawStatement createRawStatement(@NonNull String sql) {















        Objects.requireNonNull(sql);









@@ -2244,7 +2244,7 @@ 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_15)













    @FlaggedApi(Flags.FLAG_SQLITE_APIS_35)















    public long getLastInsertRowId() {















        return getThreadSession().getLastInsertRowId();















    }









@@ -2258,7 +2258,7 @@ 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_15)













    @FlaggedApi(Flags.FLAG_SQLITE_APIS_35)















    public long getLastChangedRowCount() {















        return getThreadSession().getLastChangedRowCount();















    }










@@ -2286,7 +2286,7 @@ 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_15)













    @FlaggedApi(Flags.FLAG_SQLITE_APIS_35)















    public long getTotalChangedRowCount() {















        return getThreadSession().getTotalChangedRowCount();















    }

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -71,7 +71,7 @@ import java.util.Objects;













 *















 * @see <a href="http://sqlite.org/c3ref/stmt.html">sqlite3_stmt</a>















 */













@FlaggedApi(Flags.FLAG_SQLITE_APIS_15)













@FlaggedApi(Flags.FLAG_SQLITE_APIS_35)















public final class SQLiteRawStatement implements Closeable {































    private static final String TAG = "SQLiteRawStatement";

































core/java/android/database/sqlite/flags.aconfig



+1
−1




























Original line number
Diff line number
Diff line















package: "android.database.sqlite"































flag {













     name: "sqlite_apis_15"













     name: "sqlite_apis_35"















     namespace: "system_performance"















     is_fixed_read_only: true















     description: "SQLite APIs held back for Android 15"