commit aaa9e8626a336125dbb15765a01eb078ce1ca8f6
author Tadashi G. Takaoka <takaoka@google.com> Thu Mar 29 00:10:35 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 29 00:10:35 2012 -0700
tree 446958df8499dca2b77cb28c96f1889fbb8bd48d
parent 5bf11402079424c0f5bb98e9d49f7e587d283682
parent 7769b76fc997c2afea169668ff1eee9d158b74f9

Merge "Fix race condition while changing the system locale"

java/res/xml/key_azerty_quote.xml

diff --git a/java/res/xml/key_azerty_quote.xml b/java/res/xml/key_azerty_quote.xml
index e1d1804..8c44f78 100644
--- a/java/res/xml/key_azerty_quote.xml
+++ b/java/res/xml/key_azerty_quote.xml
@@ -26,7 +26,7 @@
             latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
         >
             <Key
-                latin:keyLabel=":" />
+                latin:keyLabel="\?" />
         </case>
         <default>
             <Key

java/src/com/android/inputmethod/latin/ResearchLogger.java

diff --git a/java/src/com/android/inputmethod/latin/ResearchLogger.java b/java/src/com/android/inputmethod/latin/ResearchLogger.java
index 0694ffe..f39f082 100644
--- a/java/src/com/android/inputmethod/latin/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/latin/ResearchLogger.java
@@ -113,6 +113,7 @@
 
             close();
             mFile = new File(directory, filename);
+            mFile.setReadable(false, false);
             boolean append = true;
             if (mFile.exists() && mFile.lastModified() + LOGFILE_PURGE_INTERVAL <
                     System.currentTimeMillis()) {