| commit | 2ee64e2f8d3386b7b1f4e12808c6973d9b55a1ed | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Fri Nov 17 00:07:21 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Nov 17 00:07:21 2017 +0000 |
| tree | 7491ebdfd5fbc7c96c16b8a1d3ef14c387b02549 | |
| parent | ae314d98f645c1e83444a7bb82da12b20ea9fc2d [diff] | |
| parent | c1d4fcbc5025e270da2eef5d1868a58a93c467ac [diff] |
Merge "Merge "CTS: Fix an assert error formater in Camera2 tests." into oreo-cts-dev am: 964dea29d2"
diff --git a/tests/camera/utils/src/android/hardware/camera2/cts/helpers/AssertHelpers.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/AssertHelpers.java index a2e6a91..7e9efce 100644 --- a/tests/camera/utils/src/android/hardware/camera2/cts/helpers/AssertHelpers.java +++ b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/AssertHelpers.java
@@ -214,7 +214,7 @@ boolean first = true; for (T elem : collection) { - String val = ((first) ? ", " : "") + ((elem != null) ? elem.toString() : "null"); + String val = (first ? "" : ", ") + elem; first = false; if ((builder.length() + val.length()) > maxLen - "...]".length()) { builder.append("...");