diff options
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteConnection.java | 3 | ||||
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteGlobal.java | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 278a4ce12f1a..f03b9052a1c8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -12308,6 +12308,7 @@ package android.database.sqlite { method public static int getWALAutoCheckpoint(); method public static int getWALConnectionPoolSize(); method public static java.lang.String getWALSyncMode(); + method public static boolean isCompatibilityWalSupported(); method public static int releaseMemory(); } diff --git a/core/java/android/database/sqlite/SQLiteConnection.java b/core/java/android/database/sqlite/SQLiteConnection.java index 361b81b77f1d..b692039c28e4 100644 --- a/core/java/android/database/sqlite/SQLiteConnection.java +++ b/core/java/android/database/sqlite/SQLiteConnection.java @@ -416,7 +416,8 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen boolean foreignKeyModeChanged = configuration.foreignKeyConstraintsEnabled != mConfiguration.foreignKeyConstraintsEnabled; boolean walModeChanged = ((configuration.openFlags ^ mConfiguration.openFlags) - & SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING) != 0; + & SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING) != 0 + || configuration.useCompatibilityWal != mConfiguration.useCompatibilityWal; boolean localeChanged = !configuration.locale.equals(mConfiguration.locale); // Update configuration parameters. diff --git a/core/java/android/database/sqlite/SQLiteGlobal.java b/core/java/android/database/sqlite/SQLiteGlobal.java index bb2a51706767..d6d9764c7c38 100644 --- a/core/java/android/database/sqlite/SQLiteGlobal.java +++ b/core/java/android/database/sqlite/SQLiteGlobal.java @@ -83,7 +83,6 @@ public final class SQLiteGlobal { /** * Returns true if compatibility WAL mode is supported. In this mode, only * database journal mode is changed. Connection pool will use at most one connection. - * @hide */ public static boolean isCompatibilityWalSupported() { return SystemProperties.getBoolean("debug.sqlite.compatibility_wal_supported", |