wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out Bug 749493 for destroying Android.

Browse Source
This commit is contained in:
Kyle Huey 2012-04-27 12:09:16 -07:00
parent 72bcb7dfaa
commit 7a7a3d2594
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mobile/android/base/db/DBUtils.java
View File

@ -10,7 +10,6 @@ import org.mozilla.gecko.sync.Utils;
import android.content.ContentValues;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDatabaseLockedException;
import android.database.sqlite.SQLiteOpenHelper;
import android.os.Build;
import android.text.TextUtils;
@ -73,19 +72,22 @@ public class DBUtils {
}
public static void ensureDatabaseIsNotLocked(SQLiteOpenHelper dbHelper, String databasePath) {
try {
dbHelper.getWritableDatabase();
} catch (SQLiteDatabaseLockedException e) {
Log.d(LOGTAG, "Database is locked, trying to forcefully unlock the database file: " + databasePath);
SQLiteDatabase db = dbHelper.getWritableDatabase();
// The returned writable database is read-only, this probably means that the
// database is permanently locked due to a crash or a non-clean quit in Fennec.
// We can assume it's safe to forcefully unlock the database file in this case
// as all database access happens through this content provider (see bug 741718).
if (db.isReadOnly()) {
// Close read-only connection, we don't want to use it
dbHelper.close();
Log.d(LOGTAG, "Database is in read-only mode, trying to forcefully unlock the database file: " + databasePath);
// Forcefully unlock the database file
GeckoAppShell.unlockDatabaseFile(databasePath);
// This call should not throw if the forced unlocking
// actually fixed the situation.
dbHelper.getWritableDatabase();
// TODO: maybe check if the database is still locked and let the
// TODO: maybe check if the connection is still read-only and let the
// user know that the device needs rebooting?
}
}