aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/research/Uploader.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-03-18 18:55:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-18 18:55:25 -0700
commit3b93f0e9a7fa5c26c016288b1fed63365ae0fa58 (patch)
tree7c8db0e5590677297ee5a2125ee81f67dfaef383 /java/src/com/android/inputmethod/research/Uploader.java
parent68c09b56bf684e5bc5b8e65ad0f20b538f78a56a (diff)
parent841c295f3c99214f45924434d9c0bb5b4760578d (diff)
downloadlatinime-3b93f0e9a7fa5c26c016288b1fed63365ae0fa58.tar.gz
latinime-3b93f0e9a7fa5c26c016288b1fed63365ae0fa58.tar.xz
latinime-3b93f0e9a7fa5c26c016288b1fed63365ae0fa58.zip
am 841c295f: resolved conflicts for merge of 5b048292 to master
* commit '841c295f3c99214f45924434d9c0bb5b4760578d': Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS
Diffstat (limited to 'java/src/com/android/inputmethod/research/Uploader.java')
-rw-r--r--java/src/com/android/inputmethod/research/Uploader.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/research/Uploader.java b/java/src/com/android/inputmethod/research/Uploader.java
index 152b94d30..ba05ec12b 100644
--- a/java/src/com/android/inputmethod/research/Uploader.java
+++ b/java/src/com/android/inputmethod/research/Uploader.java
@@ -46,10 +46,11 @@ import java.net.URL;
*/
public final class Uploader {
private static final String TAG = Uploader.class.getSimpleName();
- private static final boolean DEBUG = false && ProductionFlag.IS_EXPERIMENTAL_DEBUG;
+ private static final boolean DEBUG = false
+ && ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS_DEBUG;
// Set IS_INHIBITING_AUTO_UPLOAD to true for local testing
private static final boolean IS_INHIBITING_AUTO_UPLOAD = false
- && ProductionFlag.IS_EXPERIMENTAL_DEBUG; // Force false for non-debug builds
+ && ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS_DEBUG;
private static final int BUF_SIZE = 1024 * 8;
private final Context mContext;