Merge "on readonly databases, don't set journal mode and don't allow WAL" (3f6a1f5e) · Commits · e / os / android_frameworks_base

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

+12 −6

Original line number	Diff line number	Diff line
		@@ -1023,14 +1023,16 @@ public class SQLiteDatabase extends SQLiteClosable {

		private void setJournalMode(final String dbPath, final String mode) {
		// journal mode can be set only for non-memory databases
		if (!dbPath.equalsIgnoreCase(MEMORY_DB_PATH)) {
		// AND can't be set for readonly databases
		if (dbPath.equalsIgnoreCase(MEMORY_DB_PATH) \|\| isReadOnly()) {
		return;
		}
		String s = DatabaseUtils.stringForQuery(this, "PRAGMA journal_mode=" + mode, null);
		if (!s.equalsIgnoreCase(mode)) {
		Log.e(TAG, "setting journal_mode to " + mode + " failed for db: " + dbPath +
		" (on pragma set journal_mode, sqlite returned:" + s);
		}
		}
		}

		/**
		* Create a memory backed SQLite database. Its contents will be destroyed
		@@ -2317,6 +2319,10 @@ public class SQLiteDatabase extends SQLiteClosable {
		* @return true if write-ahead-logging is set. false otherwise
		*/
		public boolean enableWriteAheadLogging() {
		// make sure the database is not READONLY. WAL doesn't make sense for readonly-databases.
		if (isReadOnly()) {
		return false;
		}
		// acquire lock - no that no other thread is enabling WAL at the same time
		lock();
		try {