Revert "treat 'can't open database file error' as 'database corruption error'" (6a904bc6) · Commits · e / os / android_frameworks_base

core/java/android/database/sqlite/SQLiteDatabase.java

+2 −10

Original line number	Diff line number	Diff line
		@@ -991,10 +991,8 @@ public class SQLiteDatabase extends SQLiteClosable {
		}
		return db;
		} catch (SQLiteDatabaseCorruptException e) {
		return handleCorruptedDatabase(db, path, factory, flags, errorHandler);
		} catch (SQLiteCantOpenDatabaseException e) {
		Log.e(TAG, "database file can't be opened. possibly due to database corruption.");
		return handleCorruptedDatabase(db, path, factory, flags, errorHandler);
		db.mErrorHandler.onCorruption(db);
		return SQLiteDatabase.openDatabase(path, factory, flags, errorHandler);
		} catch (SQLiteException e) {
		Log.e(TAG, "Failed to open the database. closing it.", e);
		db.close();
		@@ -1002,12 +1000,6 @@ public class SQLiteDatabase extends SQLiteClosable {
		}
		}

		private static SQLiteDatabase handleCorruptedDatabase(SQLiteDatabase db, String path,
		CursorFactory factory, int flags, DatabaseErrorHandler errorHandler) {
		db.mErrorHandler.onCorruption(db);
		return SQLiteDatabase.openDatabase(path, factory, flags, errorHandler);
		}

		/**
		* Equivalent to openDatabase(file.getPath(), factory, CREATE_IF_NECESSARY).
		*/