commit 902dae780a03933e1b56a2e233b0fc906034853a
author David Su <dysu@google.com> Mon Oct 21 13:25:42 2019 -0700
committer David Su <dysu@google.com> Mon Oct 21 13:29:25 2019 -0700
tree 7a5b2886d55a296cdd5176193fddb348205088f0
parent 276542d5b033a9d96c9075293f38de1f2137671e

Fix checkNotNull(a, b) usages

checkNotNull(a, b) does not check nullness of b,
instead b is the error message. Fix these usages.

While here, also change checkState() to checkArgument()
since we are doing input validation.

Bug: 143084514
Test: compiles
Change-Id: I3d5fc4446863d18d14b9bfb1cbb94084dfc05d05

service/java/com/android/server/wifi/util/EncryptedData.java

diff --git a/service/java/com/android/server/wifi/util/EncryptedData.java b/service/java/com/android/server/wifi/util/EncryptedData.java
index 91342d3..0b29099 100644
--- a/service/java/com/android/server/wifi/util/EncryptedData.java
+++ b/service/java/com/android/server/wifi/util/EncryptedData.java
@@ -29,10 +29,11 @@
     private final byte[] mIv;
 
     public EncryptedData(byte[] encryptedData, byte[] iv) {
-        Preconditions.checkNotNull(encryptedData, iv);
-        Preconditions.checkState(encryptedData.length == ENCRYPTED_DATA_LENGTH,
+        Preconditions.checkNotNull(encryptedData);
+        Preconditions.checkNotNull(iv);
+        Preconditions.checkArgument(encryptedData.length == ENCRYPTED_DATA_LENGTH,
                 "encryptedData.length=" + encryptedData.length);
-        Preconditions.checkState(iv.length == IV_LENGTH, "iv.length=" + iv.length);
+        Preconditions.checkArgument(iv.length == IV_LENGTH, "iv.length=" + iv.length);
         mEncryptedData = encryptedData;
         mIv = iv;
     }