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

Commit 7bcbeb78 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Make SQLiteDatabase final."

parents ef6f68b8 baefdfad

api/16.txt

+1 −1
Original line number Diff line number Diff line
@@ -7144,7 +7144,7 @@ package android.database.sqlite { 
    method public abstract void setBindArguments(java.lang.String[]);

  }













  public class SQLiteDatabase extends android.database.sqlite.SQLiteClosable {













  public final class SQLiteDatabase extends android.database.sqlite.SQLiteClosable {















    method public void beginTransaction();















    method public void beginTransactionNonExclusive();















    method public void beginTransactionWithListener(android.database.sqlite.SQLiteTransactionListener);

























api/current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -7267,7 +7267,7 @@ package android.database.sqlite {













    method public abstract void setBindArguments(java.lang.String[]);















  }



























  public class SQLiteDatabase extends android.database.sqlite.SQLiteClosable {













  public final class SQLiteDatabase extends android.database.sqlite.SQLiteClosable {















    method public void beginTransaction();















    method public void beginTransactionNonExclusive();















    method public void beginTransactionWithListener(android.database.sqlite.SQLiteTransactionListener);

























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



+1
−2




























Original line number
Diff line number
Diff line








@@ -19,7 +19,6 @@ package android.database.sqlite;













import android.content.CancellationSignal;















import android.content.ContentValues;















import android.content.OperationCanceledException;













import android.content.res.Resources;















import android.database.Cursor;















import android.database.DatabaseErrorHandler;















import android.database.DatabaseUtils;










@@ -65,7 +64,7 @@ import java.util.WeakHashMap;













 * to the current locale.















 * </p>















 */













public class SQLiteDatabase extends SQLiteClosable {













public final class SQLiteDatabase extends SQLiteClosable {















    private static final String TAG = "SQLiteDatabase";































    private static final int EVENT_DB_CORRUPT = 75004;

































core/java/android/database/sqlite/SQLiteDebug.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -62,6 +62,9 @@ public final class SQLiteDebug {













     */















    public static final boolean DEBUG_LOG_SLOW_QUERIES = Build.IS_DEBUGGABLE;





























    private SQLiteDebug() {













    }





























    /**















     * Determines whether a query should be logged.















     *

































core/java/android/database/sqlite/SQLiteDirectCursorDriver.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -25,7 +25,7 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory;













 * 















 * @hide















 */













public class SQLiteDirectCursorDriver implements SQLiteCursorDriver {













public final class SQLiteDirectCursorDriver implements SQLiteCursorDriver {















    private final SQLiteDatabase mDatabase;















    private final String mEditTable; 















    private final String mSql;