commit a1c8344df866033a0baae0d76fae208e5ab8034a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 13 21:22:18 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 13 21:22:18 2017 +0000
tree 1856a1f5c3fd81dac47df9aeee0c89332355f93b
parent ab2a30027225b5f93c5101b6cb29e59914d52bf8
parent 09eda2a16be6f1fbd9f1dc11138f19c32c97d0e7

Merge "Include what we use."

tests/signature/api-check/Android.mk

diff --git a/tests/signature/api-check/Android.mk b/tests/signature/api-check/Android.mk
index 013cc4d..1d616cb 100644
--- a/tests/signature/api-check/Android.mk
+++ b/tests/signature/api-check/Android.mk
@@ -32,6 +32,7 @@
     cts-signature-common \
     repackaged-legacy-test \
     repackaged.android.test.runner \
+    repackaged.android.test.mock \
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 

tests/signature/api/Android.mk

diff --git a/tests/signature/api/Android.mk b/tests/signature/api/Android.mk
index 71e33ae..9be5e06 100644
--- a/tests/signature/api/Android.mk
+++ b/tests/signature/api/Android.mk
@@ -62,7 +62,7 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := cts-android-test-mock-current-api
 LOCAL_MODULE_STEM := android-test-mock-current.api
-LOCAL_SRC_FILES := frameworks/base/test-runner/api/android-test-mock-current.txt
+LOCAL_SRC_FILES := frameworks/base/test-mock/api/android-test-mock-current.txt
 
 include $(LOCAL_PATH)/build_xml_api_file.mk
 

tests/tests/net/src/android/net/cts/IpSecManagerTest.java

diff --git a/tests/tests/net/src/android/net/cts/IpSecManagerTest.java b/tests/tests/net/src/android/net/cts/IpSecManagerTest.java
index 75bc528..9f3ad2f 100644
--- a/tests/tests/net/src/android/net/cts/IpSecManagerTest.java
+++ b/tests/tests/net/src/android/net/cts/IpSecManagerTest.java
@@ -326,56 +326,56 @@
     public void testAesCbcHmacMd5Tcp4() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(128), 96);
         checkTransform(IPPROTO_TCP, IPV4_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacMd5Tcp6() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(128), 96);
         checkTransform(IPPROTO_TCP, IPV6_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacMd5Udp4() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(128), 96);
         checkTransform(IPPROTO_UDP, IPV4_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacMd5Udp6() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(128), 96);
         checkTransform(IPPROTO_UDP, IPV6_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacSha1Tcp4() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(160), 96);
         checkTransform(IPPROTO_TCP, IPV4_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacSha1Tcp6() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(160), 96);
         checkTransform(IPPROTO_TCP, IPV6_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacSha1Udp4() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(160), 96);
         checkTransform(IPPROTO_UDP, IPV4_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacSha1Udp6() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(160), 96);
         checkTransform(IPPROTO_UDP, IPV6_LOOPBACK, crypt, auth);
     }