Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aadf1b66 authored by Daulet Zhanguzin's avatar Daulet Zhanguzin
Browse files

Correct Preconditions.checkNotNull usage. 

Reference to check should be first parameter. Since Preconditions
doesn't have the right overload using Objects.requireNonNull, transition
to which was already planned.

Bug: 146340409

Test: Treehugger
Change-Id: I77b8c1f247c2f6e9abdbfe3bc627be04bd4d407b
parent a46c4537

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraErrorCollector.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/InMatcher.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }