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

am 12a19551: Merge change I58def690 into eclair-mr2

Browse Source 
Merge commit '12a19551dd106b04898d262807213ce4c6d1e5f7' into eclair-mr2-plus-aosp

* commit '12a19551dd106b04898d262807213ce4c6d1e5f7':
  If openOrCreateDatabase() throws an exception, delete
This commit is contained in:
Grace Kloba
2009-10-20 10:13:59 -07:00
committed by Android Git Automerger
parent 4d7c4b0bab 12a19551dd
commit 1bee613196
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/webkit/WebViewDatabase.java
View File

@@ -27,6 +27,7 @@ import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.DatabaseUtils; import android.database.DatabaseUtils;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteStatement; import android.database.sqlite.SQLiteStatement;
import android.util.Log; import android.util.Log;
import android.webkit.CookieManager.Cookie; import android.webkit.CookieManager.Cookie;
@@ -174,7 +175,16 @@ public class WebViewDatabase {
public static synchronized WebViewDatabase getInstance(Context context) { public static synchronized WebViewDatabase getInstance(Context context) {
if (mInstance == null) { if (mInstance == null) {
mInstance = new WebViewDatabase(); mInstance = new WebViewDatabase();
mDatabase = context.openOrCreateDatabase(DATABASE_FILE, 0, null); try {
mDatabase = context
.openOrCreateDatabase(DATABASE_FILE, 0, null);
} catch (SQLiteException e) {
// try again by deleting the old db and create a new one
if (context.deleteDatabase(DATABASE_FILE)) {
mDatabase = context.openOrCreateDatabase(DATABASE_FILE, 0,
null);
}
}
// mDatabase should not be null, // mDatabase should not be null,
// the only case is RequestAPI test has problem to create db // the only case is RequestAPI test has problem to create db
@@ -194,8 +204,16 @@ public class WebViewDatabase {
mDatabase.setLockingEnabled(false); mDatabase.setLockingEnabled(false);
} }
mCacheDatabase = context.openOrCreateDatabase(CACHE_DATABASE_FILE, try {
0, null); mCacheDatabase = context.openOrCreateDatabase(
CACHE_DATABASE_FILE, 0, null);
} catch (SQLiteException e) {
// try again by deleting the old db and create a new one
if (context.deleteDatabase(CACHE_DATABASE_FILE)) {
mCacheDatabase = context.openOrCreateDatabase(
CACHE_DATABASE_FILE, 0, null);
}
}
// mCacheDatabase should not be null, // mCacheDatabase should not be null,
// the only case is RequestAPI test has problem to create db // the only case is RequestAPI test has problem to create db