Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make SQLiteDatabase final."

Browse Source
This commit is contained in:
Jeff Brown
2012-03-05 13:38:59 -08:00
committed by Android (Google) Code Review
parent ef6f68b8c8 baefdfad6e
commit 7bcbeb789d
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/16.txt
View File

@@ -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);

2
api/current.txt
View File

@@ -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);

3
core/java/android/database/sqlite/SQLiteDatabase.java
View File

@@ -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;

3
core/java/android/database/sqlite/SQLiteDebug.java
View File

@@ -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.
*

2
core/java/android/database/sqlite/SQLiteDirectCursorDriver.java
View File

@@ -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;