From baefdfad6e77e772deb6474380dd85ac776293e8 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 5 Mar 2012 10:33:13 -0800 Subject: [PATCH] Make SQLiteDatabase final. The SQLiteDatabase constructor is inaccessible so it is not possible for applications to subclass it. To remove all possible remaining temptation to do so, make the class final. Change-Id: I4148e9b06f0661ec22aab8e45afde38498d2375a --- api/16.txt | 2 +- api/current.txt | 2 +- core/java/android/database/sqlite/SQLiteDatabase.java | 3 +-- core/java/android/database/sqlite/SQLiteDebug.java | 3 +++ .../java/android/database/sqlite/SQLiteDirectCursorDriver.java | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/api/16.txt b/api/16.txt index 357d6182d2dfd..6543ab0e892e4 100644 --- a/api/16.txt +++ b/api/16.txt @@ -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); diff --git a/api/current.txt b/api/current.txt index 95c7a316ce1c4..596a704afe8ab 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index 04ee142c09dd9..604247e48c439 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -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. *

*/ -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; diff --git a/core/java/android/database/sqlite/SQLiteDebug.java b/core/java/android/database/sqlite/SQLiteDebug.java index 10ce99108433d..11973312a3a31 100644 --- a/core/java/android/database/sqlite/SQLiteDebug.java +++ b/core/java/android/database/sqlite/SQLiteDebug.java @@ -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. * diff --git a/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java b/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java index 3375e74763673..294edc425cf9a 100644 --- a/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java +++ b/core/java/android/database/sqlite/SQLiteDirectCursorDriver.java @@ -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;