summaryrefslogtreecommitdiffstats
path: root/core/java/android/database
diff options
context:
space:
mode:
authorPin Ting <pinting@google.com>2012-01-20 01:37:12 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-20 01:37:12 -0800
commitf17e7c272e27671d12fbf676d209f0a77f1acda1 (patch)
tree3ff5a7151c6b29d44ab7acca562aee72a4868ef7 /core/java/android/database
parent8592baa347f5874b4f36713b6ca2edcedbb3f071 (diff)
parent1c423b81deda88cffdf27c4b0aafc0f4daf3ac8f (diff)
downloadframeworks_base-f17e7c272e27671d12fbf676d209f0a77f1acda1.zip
frameworks_base-f17e7c272e27671d12fbf676d209f0a77f1acda1.tar.gz
frameworks_base-f17e7c272e27671d12fbf676d209f0a77f1acda1.tar.bz2
Merge "Fixes some javadoc."
Diffstat (limited to 'core/java/android/database')
-rw-r--r--core/java/android/database/sqlite/SQLiteOpenHelper.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/database/sqlite/SQLiteOpenHelper.java b/core/java/android/database/sqlite/SQLiteOpenHelper.java
index 31da7e4..46d9369 100644
--- a/core/java/android/database/sqlite/SQLiteOpenHelper.java
+++ b/core/java/android/database/sqlite/SQLiteOpenHelper.java
@@ -81,7 +81,8 @@ public abstract class SQLiteOpenHelper {
* @param name of the database file, or null for an in-memory database
* @param factory to use for creating cursor objects, or null for the default
* @param version number of the database (starting at 1); if the database is older,
- * {@link #onUpgrade} will be used to upgrade the database
+ * {@link #onUpgrade} will be used to upgrade the database; if the database is
+ * newer, {@link #onDowngrade} will be used to downgrade the database
* @param errorHandler the {@link DatabaseErrorHandler} to be used when sqlite reports database
* corruption.
*/
@@ -100,7 +101,7 @@ public abstract class SQLiteOpenHelper {
}
/**
- * Return the name of the SQLite database being opened, as given tp
+ * Return the name of the SQLite database being opened, as given to
* the constructor.
*/
public String getDatabaseName() {
@@ -297,7 +298,7 @@ public abstract class SQLiteOpenHelper {
public abstract void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion);
/**
- * Called when the database needs to be downgraded. This is stricly similar to
+ * Called when the database needs to be downgraded. This is strictly similar to
* onUpgrade() method, but is called whenever current version is newer than requested one.
* However, this method is not abstract, so it is not mandatory for a customer to
* implement it. If not overridden, default implementation will reject downgrade and