From baefdfad6e77e772deb6474380dd85ac776293e8 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 5 Mar 2012 10:33:13 -0800 Subject: 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 --- core/java/android/database/sqlite/SQLiteDatabase.java | 3 +-- core/java/android/database/sqlite/SQLiteDebug.java | 3 +++ core/java/android/database/sqlite/SQLiteDirectCursorDriver.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'core/java/android') diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index 04ee142..604247e 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 10ce991..1197331 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 3375e74..294edc4 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; -- cgit v1.1