aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/research/ResearchLog.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-03-19 10:48:10 +0900
committerTadashi G. Takaoka <takaoka@google.com>2013-03-19 10:48:10 +0900
commit841c295f3c99214f45924434d9c0bb5b4760578d (patch)
tree62226e13d2674b0e99e0d49a899aa30ab6b5eb91 /java/src/com/android/inputmethod/research/ResearchLog.java
parentbbadc6ed2f8a74214bcc328c7b4d7f9bb55d6ef0 (diff)
parent5b048292540b6fbbd8929a3622262f352245d464 (diff)
downloadlatinime-841c295f3c99214f45924434d9c0bb5b4760578d.tar.gz
latinime-841c295f3c99214f45924434d9c0bb5b4760578d.tar.xz
latinime-841c295f3c99214f45924434d9c0bb5b4760578d.zip
resolved conflicts for merge of 5b048292 to master
Change-Id: I67ebab46954cd7b8e3e79e7fed523bafb15f8835
Diffstat (limited to 'java/src/com/android/inputmethod/research/ResearchLog.java')
-rw-r--r--java/src/com/android/inputmethod/research/ResearchLog.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/research/ResearchLog.java b/java/src/com/android/inputmethod/research/ResearchLog.java
index 080366e9b..35a491f2c 100644
--- a/java/src/com/android/inputmethod/research/ResearchLog.java
+++ b/java/src/com/android/inputmethod/research/ResearchLog.java
@@ -47,12 +47,14 @@ import java.util.concurrent.TimeUnit;
* tries to avoid creating unnecessary files if there is nothing to write. It also handles
* flushing, making sure it happens, but not too frequently.
*
- * This functionality is off by default. See {@link ProductionFlag#IS_EXPERIMENTAL}.
+ * This functionality is off by default. See
+ * {@link ProductionFlag#USES_DEVELOPMENT_ONLY_DIAGNOSTICS}.
*/
public class ResearchLog {
// TODO: Automatically initialize the JsonWriter rather than requiring the caller to manage it.
private static final String TAG = ResearchLog.class.getSimpleName();
- private static final boolean DEBUG = false && ProductionFlag.IS_EXPERIMENTAL_DEBUG;
+ private static final boolean DEBUG = false
+ && ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS_DEBUG;
private static final long FLUSH_DELAY_IN_MS = 1000 * 5;
/* package */ final ScheduledExecutorService mExecutor;