am 7b0a1489: Merge "Rename a var to match semantics"

* commit '7b0a14895100c4af8b6ed8b33f8885f77cccf62c':
  Rename a var to match semantics
main
Kurt Partridge 2013-05-14 11:05:24 -07:00 committed by Android Git Automerger
commit f431ddcdb1
1 changed files with 2 additions and 2 deletions

View File

@ -49,7 +49,7 @@ public final class Uploader {
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
private static final boolean IS_INHIBITING_UPLOAD = false
&& ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS_DEBUG;
private static final int BUF_SIZE = 1024 * 8;
@ -76,7 +76,7 @@ public final class Uploader {
}
public boolean isPossibleToUpload() {
return hasUploadingPermission() && mUrl != null && !IS_INHIBITING_AUTO_UPLOAD;
return hasUploadingPermission() && mUrl != null && !IS_INHIBITING_UPLOAD;
}
private boolean hasUploadingPermission() {