Error Prone: Enable and fix OperatorPrecedence

Change-Id: I1c9e79a37cba650b1526793fc7997544bb99aafc
diff --git a/java/com/google/gerrit/server/submit/SubmoduleOp.java b/java/com/google/gerrit/server/submit/SubmoduleOp.java
index d3a578f..070d80f 100644
--- a/java/com/google/gerrit/server/submit/SubmoduleOp.java
+++ b/java/com/google/gerrit/server/submit/SubmoduleOp.java
@@ -656,7 +656,7 @@
         int newSize = msgbuf.length() + bullet.length() + message.length();
         if (++numMessages > maxCommitMessages
             || newSize > maxCombinedCommitMessageSize
-            || iter.hasNext() && (newSize + ellipsis.length()) > maxCombinedCommitMessageSize) {
+            || (iter.hasNext() && (newSize + ellipsis.length()) > maxCombinedCommitMessageSize)) {
           msgbuf.append(ellipsis);
           break;
         }
diff --git a/tools/BUILD b/tools/BUILD
index aa3bb4b..2ded4c4 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -65,7 +65,7 @@
         "-Xep:NullableConstructor:WARN",
         "-Xep:NullablePrimitive:WARN",
         "-Xep:NullableVoid:WARN",
-        "-Xep:OperatorPrecedence:WARN",
+        "-Xep:OperatorPrecedence:ERROR",
         "-Xep:OverridesGuiceInjectableMethod:WARN",
         "-Xep:PreconditionsInvalidPlaceholder:WARN",
         "-Xep:ProtoFieldPreconditionsCheckNotNull:WARN",