Merge "Add new network capabilities to support automotive head unit via USB" into sc-dev

2021-03-30 14:36:56 +00:00
parent 79a5d34354 e545c385a8
commit a610eede44
4 changed files with 25 additions and 6 deletions
--- a/tests/net/java/android/net/util/KeepaliveUtilsTest.kt
+++ b/tests/net/java/android/net/util/KeepaliveUtilsTest.kt
@@ -101,7 +101,7 @@ class KeepaliveUtilsTest {

        // Check valid customization generates expected array.
        val validRes = arrayOf("0,3", "1,0", "4,4")
-        val expectedValidRes = intArrayOf(3, 0, 0, 0, 4, 0, 0, 0)
+        val expectedValidRes = intArrayOf(3, 0, 0, 0, 4, 0, 0, 0, 0)

        val mockContext = getMockedContextWithStringArrayRes(
                R.array.config_networkSupportedKeepaliveCount,