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

Commit 97d8ecfa authored by Shai Barack's avatar Shai Barack
Browse files

Add some missing nullability annotations in SQLiteDatabase 

Align param docs with annotations.
selectionArgs, whereArgs, nullColumnHack should be nullable.
table and sql should be nonnull.
Also tag values, initialValues accordingly.
Annotated return values.

Fixes: 264142524
Test: N/A
Change-Id: Ic660f7ba8d3b135b45efb48a73a5e7487cbb18ca
parent a0d4016e

core/api/current.txt

+19 −19
Original line number Diff line number Diff line
@@ -14341,14 +14341,14 @@ package android.database.sqlite { 
    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 @NonNull public android.database.sqlite.SQLiteRawStatement createRawStatement(@NonNull String);

    method public int delete(String, String, String[]);

    method public int delete(@NonNull String, @Nullable String, @Nullable String[]);

    method public static boolean deleteDatabase(@NonNull java.io.File);

    method public void disableWriteAheadLogging();

    method public boolean enableWriteAheadLogging();

    method public void endTransaction();

    method public void execPerConnectionSQL(@NonNull String, @Nullable Object[]) throws android.database.SQLException;

    method public void execSQL(String) throws android.database.SQLException;

    method public void execSQL(String, Object[]) throws android.database.SQLException;

    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 public long getLastChangedRowCount();
@@ -14360,9 +14360,9 @@ package android.database.sqlite { 
    method public long getTotalChangedRowCount();

    method public int getVersion();

    method public boolean inTransaction();

    method public long insert(String, String, android.content.ContentValues);

    method public long insertOrThrow(String, String, android.content.ContentValues) throws android.database.SQLException;

    method public long insertWithOnConflict(String, String, android.content.ContentValues, int);

    method public long insert(@NonNull String, @Nullable String, @Nullable android.content.ContentValues);

    method public long insertOrThrow(@NonNull String, @Nullable String, @Nullable android.content.ContentValues) throws android.database.SQLException;

    method public long insertWithOnConflict(@NonNull String, @Nullable String, @Nullable android.content.ContentValues, int);

    method public boolean isDatabaseIntegrityOk();

    method public boolean isDbLockedByCurrentThread();

    method @Deprecated public boolean isDbLockedByOtherThreads();
@@ -14379,19 +14379,19 @@ package android.database.sqlite { 
    method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(@NonNull java.io.File, @Nullable android.database.sqlite.SQLiteDatabase.CursorFactory);

    method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(@NonNull String, @Nullable android.database.sqlite.SQLiteDatabase.CursorFactory);

    method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(@NonNull String, @Nullable android.database.sqlite.SQLiteDatabase.CursorFactory, @Nullable android.database.DatabaseErrorHandler);

    method public android.database.Cursor query(boolean, String, String[], String, String[], String, String, String, String);

    method public android.database.Cursor query(boolean, String, String[], String, String[], String, String, String, String, android.os.CancellationSignal);

    method public android.database.Cursor query(String, String[], String, String[], String, String, String);

    method public android.database.Cursor query(String, String[], String, String[], String, String, String, String);

    method public android.database.Cursor queryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, boolean, String, String[], String, String[], String, String, String, String);

    method public android.database.Cursor queryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, boolean, String, String[], String, String[], String, String, String, String, android.os.CancellationSignal);

    method public android.database.Cursor rawQuery(String, String[]);

    method public android.database.Cursor rawQuery(String, String[], android.os.CancellationSignal);

    method public android.database.Cursor rawQueryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, String, String[], String);

    method public android.database.Cursor rawQueryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, String, String[], String, android.os.CancellationSignal);

    method @NonNull public android.database.Cursor query(boolean, @NonNull String, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String, @Nullable String, @Nullable String, @Nullable String);

    method @NonNull public android.database.Cursor query(boolean, @NonNull String, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String, @Nullable String, @Nullable String, @Nullable String, @Nullable android.os.CancellationSignal);

    method @NonNull public android.database.Cursor query(@NonNull String, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String, @Nullable String, @Nullable String);

    method @NonNull public android.database.Cursor query(@NonNull String, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String, @Nullable String, @Nullable String, @Nullable String);

    method @NonNull public android.database.Cursor queryWithFactory(@Nullable android.database.sqlite.SQLiteDatabase.CursorFactory, boolean, @NonNull String, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String, @Nullable String, @Nullable String, @Nullable String);

    method @NonNull public android.database.Cursor queryWithFactory(@Nullable android.database.sqlite.SQLiteDatabase.CursorFactory, boolean, @NonNull String, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String, @Nullable String, @Nullable String, @Nullable String, @Nullable android.os.CancellationSignal);

    method @NonNull public android.database.Cursor rawQuery(@NonNull String, @Nullable String[]);

    method @NonNull public android.database.Cursor rawQuery(@NonNull String, @Nullable String[], @Nullable android.os.CancellationSignal);

    method @NonNull public android.database.Cursor rawQueryWithFactory(@Nullable android.database.sqlite.SQLiteDatabase.CursorFactory, @NonNull String, @Nullable String[], @NonNull String);

    method @NonNull public android.database.Cursor rawQueryWithFactory(@Nullable android.database.sqlite.SQLiteDatabase.CursorFactory, @NonNull String, @Nullable String[], @NonNull String, @Nullable android.os.CancellationSignal);

    method public static int releaseMemory();

    method public long replace(String, String, android.content.ContentValues);

    method public long replaceOrThrow(String, String, android.content.ContentValues) throws android.database.SQLException;

    method public long replace(@NonNull String, @Nullable String, @Nullable android.content.ContentValues);

    method public long replaceOrThrow(@NonNull String, @Nullable String, @Nullable android.content.ContentValues) throws android.database.SQLException;

    method public void setCustomAggregateFunction(@NonNull String, @NonNull java.util.function.BinaryOperator<java.lang.String>) throws android.database.sqlite.SQLiteException;

    method public void setCustomScalarFunction(@NonNull String, @NonNull java.util.function.UnaryOperator<java.lang.String>) throws android.database.sqlite.SQLiteException;

    method public void setForeignKeyConstraintsEnabled(boolean);
@@ -14402,8 +14402,8 @@ package android.database.sqlite { 
    method public void setPageSize(long);

    method public void setTransactionSuccessful();

    method public void setVersion(int);

    method public int update(String, android.content.ContentValues, String, String[]);

    method public int updateWithOnConflict(String, android.content.ContentValues, String, String[], int);

    method public int update(@NonNull String, @Nullable android.content.ContentValues, @Nullable String, @Nullable String[]);

    method public int updateWithOnConflict(@NonNull String, @Nullable android.content.ContentValues, @Nullable String, @Nullable String[], int);

    method public void validateSql(@NonNull String, @Nullable android.os.CancellationSignal);

    method @Deprecated public boolean yieldIfContended();

    method public boolean yieldIfContendedSafely();

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

+98 −54

File changed.

Preview size limit exceeded, changes collapsed.