LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "cronet: Fix AutoBoxing API linter issue"

Browse Source
This commit is contained in:
Dan Stahr
2023-03-16 15:03:55 +00:00
committed by Gerrit Code Review
parent 020b31904a 5cdd07aa26
commit 9ed7a339a1
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Cronet/tests/cts/src/android/net/http/cts/QuicOptionsTest.kt
View File

@@ -19,6 +19,9 @@ import android.net.http.QuicOptions
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import java.time.Duration import java.time.Duration
import kotlin.test.assertFailsWith
import kotlin.test.assertFalse
import kotlin.test.assertTrue
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
@@ -30,7 +33,10 @@ class QuicOptionsTest {
assertThat(quicOptions.allowedQuicHosts).isEmpty() assertThat(quicOptions.allowedQuicHosts).isEmpty()
assertThat(quicOptions.handshakeUserAgent).isNull() assertThat(quicOptions.handshakeUserAgent).isNull()
assertThat(quicOptions.idleConnectionTimeout).isNull() assertThat(quicOptions.idleConnectionTimeout).isNull()
assertThat(quicOptions.inMemoryServerConfigsCacheSize).isNull() assertFalse(quicOptions.hasInMemoryServerConfigsCacheSize())
assertFailsWith(IllegalStateException::class) {
quicOptions.inMemoryServerConfigsCacheSize
}
} }
@Test @Test
@@ -61,6 +67,7 @@ class QuicOptionsTest {
val quicOptions = QuicOptions.Builder() val quicOptions = QuicOptions.Builder()
.setInMemoryServerConfigsCacheSize(42) .setInMemoryServerConfigsCacheSize(42)
.build() .build()
assertTrue(quicOptions.hasInMemoryServerConfigsCacheSize())
assertThat(quicOptions.inMemoryServerConfigsCacheSize) assertThat(quicOptions.inMemoryServerConfigsCacheSize)
.isEqualTo(42) .isEqualTo(42)
} }

3
Tethering/common/TetheringLib/cronet_enabled/api/current.txt
View File

@@ -177,7 +177,8 @@ package android.net.http {
method @NonNull public java.util.Set<java.lang.String> getAllowedQuicHosts(); method @NonNull public java.util.Set<java.lang.String> getAllowedQuicHosts();
method @Nullable public String getHandshakeUserAgent(); method @Nullable public String getHandshakeUserAgent();
method @Nullable public java.time.Duration getIdleConnectionTimeout(); method @Nullable public java.time.Duration getIdleConnectionTimeout();
method @Nullable public Integer getInMemoryServerConfigsCacheSize(); method public int getInMemoryServerConfigsCacheSize();
method public boolean hasInMemoryServerConfigsCacheSize();
} }
public static final class QuicOptions.Builder { public static final class QuicOptions.Builder {