From aadf1b6670f798b83fe129560ea272931a91a6e8 Mon Sep 17 00:00:00 2001
From: Daulet Zhanguzin <dauletz@google.com>
Date: Wed, 18 Dec 2019 15:32:18 +0000
Subject: [PATCH] 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
---
 .../mediaframeworktest/helpers/CameraErrorCollector.java      | 4 ++--
 .../src/com/android/mediaframeworktest/helpers/InMatcher.java | 2 +-
 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 6facec4bfe5b8..41914b887b2bc 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 e25a140378d85..c77a042ae38b7 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;
     }