commit 1aafd31b4a8df4fe6f0c22ca3447bc762aecbb4d
author Shubham Ajmera <shubhamajmera@google.com> Mon Mar 28 10:57:38 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 28 10:57:38 2016 +0000
tree 5cf98f9050c65351a72727f9c89fc503e3c9fe89
parent d4a9b5bad7f2f4b1ea3234777e66e6d4e092e5d4
parent 4293e554dbdc7aae8f965b8da96be03219584a17

Merge "Add OpenJDK Arrays parallelSetAll methods"

core/res/res/values/config.xml

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4ca6766..91502e8 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1374,8 +1374,11 @@
          Choices are: OFF, DELETE, TRUNCATE, PERSIST and MEMORY.
          PERSIST may improve performance by reducing how often journal blocks are
          reallocated (compared to truncation) resulting in better data block locality
-         and less churn of the storage media. -->
-    <string name="db_default_journal_mode" translatable="false">PERSIST</string>
+         and less churn of the storage media.
+
+         The PERSIST mode results in data persisting in the journal beyond the life of
+         a transaction, so it interacts poorly with SECURE_DELETE. -->
+    <string name="db_default_journal_mode" translatable="false">TRUNCATE</string>
 
     <!-- Maximum size of the persistent journal file in bytes.
          If the journal file grows to be larger than this amount then SQLite will