diff options
2 files changed, 3 insertions, 3 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraErrorCollector.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraErrorCollector.java index 6facec4bfe5b..41914b887b2b 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraErrorCollector.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraErrorCollector.java @@ -969,7 +969,7 @@ public class CameraErrorCollector extends ErrorCollector { */ private static class IntInMatcher extends InMatcher<Integer> { public IntInMatcher(int[] values) { - Preconditions.checkNotNull("values", values); + Objects.requireNonNull(values, "values"); mValues = new ArrayList<>(values.length); for (int i : values) { mValues.add(i); @@ -1005,7 +1005,7 @@ public class CameraErrorCollector extends ErrorCollector { */ private static class BooleanInMatcher extends InMatcher<Boolean> { public BooleanInMatcher(boolean[] values) { - Preconditions.checkNotNull("values", values); + Objects.requireNonNull(values, "values"); mValues = new ArrayList<>(values.length); for (boolean i : values) { mValues.add(i); diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/InMatcher.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/InMatcher.java index e25a140378d8..c77a042ae38b 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/InMatcher.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/InMatcher.java @@ -36,7 +36,7 @@ public class InMatcher<T> extends BaseMatcher<T> { protected Collection<T> mValues; public InMatcher(Collection<T> values) { - Preconditions.checkNotNull("values", values); + Objects.requireNonNull(values, "values"); mValues = values; } |