Merge "Update log and make a variable private (A35)."

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

@@ -532,8 +532,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
                     SuggestedWords words = (SuggestedWords) value;
                     mJsonWriter.beginObject();
                     mJsonWriter.name("typedWordValid").value(words.mTypedWordValid);
-                    mJsonWriter.name("hasAutoCorrectionCandidate")
-                        .value(words.mHasAutoCorrectionCandidate);
+                    mJsonWriter.name("willAutoCorrect").value(words.mWillAutoCorrect);
                     mJsonWriter.name("isPunctuationSuggestions")
                         .value(words.mIsPunctuationSuggestions);
                     mJsonWriter.name("isObsoleteSuggestions")

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

@@ -28,7 +28,7 @@ public class SuggestedWords {
             new ArrayList<SuggestedWordInfo>(0), false, false, false, false, false);
 
     public final boolean mTypedWordValid;
-    public final boolean mHasAutoCorrectionCandidate;
+    private final boolean mHasAutoCorrectionCandidate;
     public final boolean mWillAutoCorrect;
     public final boolean mIsPunctuationSuggestions;
     public final boolean mIsObsoleteSuggestions;