am dd5737b0: Merge "Fix unit test breakage"

* commit 'dd5737b0fa3bf68f90534457ed8d23437caf5420':
  Fix unit test breakage

2 files changed, 7 insertions, 1 deletions

diff --git a/common/src/com/android/inputmethod/latin/common/CodePointUtils.java b/common/src/com/android/inputmethod/latin/common/CodePointUtils.java
index 38aba7bd2..592da5c1f 100644
--- a/common/src/com/android/inputmethod/latin/common/CodePointUtils.java
+++ b/common/src/com/android/inputmethod/latin/common/CodePointUtils.java
@@ -16,9 +16,13 @@
 
 package com.android.inputmethod.latin.common;
 
+import com.android.inputmethod.annotations.UsedForTesting;
+
 import java.util.Random;
 
 // Utility methods related with code points used for tests.
+// TODO: Figure out where this class should be.
+@UsedForTesting
 public class CodePointUtils {
     private CodePointUtils() {
         // This utility class is not publicly instantiable.
@@ -60,6 +64,7 @@ public class CodePointUtils {
         0x00FF /* LATIN SMALL LETTER Y WITH DIAERESIS */
     };
 
+    @UsedForTesting
     public static int[] generateCodePointSet(final int codePointSetSize, final Random random) {
         final int[] codePointSet = new int[codePointSetSize];
         for (int i = codePointSet.length - 1; i >= 0; ) {
@@ -80,6 +85,7 @@ public class CodePointUtils {
     /**
      * Generates a random word.
      */
+    @UsedForTesting
     public static String generateWord(final Random random, final int[] codePointSet) {
         StringBuilder builder = new StringBuilder();
         // 8 * 4 = 32 chars max, but we do it the following way so as to bias the random toward
diff --git a/common/src/com/android/inputmethod/latin/common/Constants.java b/common/src/com/android/inputmethod/latin/common/Constants.java
index 0b3b014f9..a0cbd2c38 100644
--- a/common/src/com/android/inputmethod/latin/common/Constants.java
+++ b/common/src/com/android/inputmethod/latin/common/Constants.java
@@ -300,7 +300,7 @@ public final class Constants {
 
     /**
      * Screen metrics (a.k.a. Device form factor) constants of
-     * {@link R.integer#config_screen_metrics}.
+     * {@link com.android.inputmethod.latin.R.integer#config_screen_metrics}.
      */
     public static final int SCREEN_METRICS_SMALL_PHONE = 0;
     public static final int SCREEN_METRICS_LARGE_PHONE = 1;