diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-10-17 19:24:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-17 19:24:55 +0000 |
| commit | 1dc92fa1079cc1b8b7d6b549691a60b59f58e741 (patch) | |
| tree | 5de301ba88a34ec62b2fbd12bfeb4802b49d1636 | |
| parent | fe51f8f2c60976398771aed07c643526ce1d5abf (diff) | |
| parent | 73c342652c2f19e5744725b1b08d637c6dce09d9 (diff) | |
| download | hidl-1dc92fa1079cc1b8b7d6b549691a60b59f58e741.tar.gz | |
Merge "Fix errorprone warnings that should be errors" am: 73c342652c
Original change: https://android-review.googlesource.com/c/platform/system/tools/hidl/+/2254750
Change-Id: I44e2ca4336a9284419d22e8477301bbe8aae7aea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | CompoundType.cpp | 2 | ||||
| -rw-r--r-- | test/java_test/src/com/android/commands/hidl_test_java/HidlTestJava.java | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/CompoundType.cpp b/CompoundType.cpp index aa12c10d..8b26df66 100644 --- a/CompoundType.cpp +++ b/CompoundType.cpp @@ -1751,7 +1751,7 @@ void CompoundType::emitJavaTypeDeclarations(Formatter& out, bool atTopLevel) con } out.unindent(); - out << "};\n\n"; + out << "}\n\n"; } void CompoundType::emitStructReaderWriter( diff --git a/test/java_test/src/com/android/commands/hidl_test_java/HidlTestJava.java b/test/java_test/src/com/android/commands/hidl_test_java/HidlTestJava.java index 81ef580f..47adad8f 100644 --- a/test/java_test/src/com/android/commands/hidl_test_java/HidlTestJava.java +++ b/test/java_test/src/com/android/commands/hidl_test_java/HidlTestJava.java @@ -930,8 +930,7 @@ public final class HidlTestJava { ExpectTrue(java.util.Objects.deepEquals(outArray, expectedOutArray)); ArrayList<Integer> outVec = proxy.mapThisVector(paramVec); - java.util.Objects.equals(outVec, expectedOutVec); - + ExpectTrue(java.util.Objects.equals(outVec, expectedOutVec)); } Expect(proxy.doStuffAndReturnAString(), "Hello, world!"); @@ -1421,8 +1420,7 @@ public final class HidlTestJava { public void takeAMask(byte bf, byte first, IBase.MyMask second, byte third, takeAMaskCallback cb) { - cb.onValues(bf, (byte)(bf | first), - (byte)(second.value & bf), (byte)((bf | bf) & third)); + cb.onValues(bf, (byte) (bf | first), (byte) (second.value & bf), (byte) (bf & third)); } public LotsOfPrimitiveArrays testArrays(LotsOfPrimitiveArrays in) { |