Merge "Correct Preconditions.checkNotNull usage."
This commit is contained in:
committed by
Android (Google) Code Review
commit
7c52e66326
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user