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

Merge "Correct the order of import and remove unused definition" am: e6f9de64af am: 97cfd8dede

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2618615

Change-Id: Id28d52fabde8dd9f8d9fd7fb855975cf7a4de7f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-06-07 10:13:01 +00:00
committed by Automerger Merge Worker
parent a1d077267e 97cfd8dede
commit a63aba4e33
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/common/java/android/net/NattKeepalivePacketDataTest.kt
View File

@@ -22,9 +22,9 @@ import android.net.NattSocketKeepalive.NATT_PORT
import android.os.Build import android.os.Build
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4 import androidx.test.runner.AndroidJUnit4
import com.android.testutils.assertEqualBothWays
import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRule
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
import com.android.testutils.assertEqualBothWays
import com.android.testutils.assertParcelingIsLossless import com.android.testutils.assertParcelingIsLossless
import com.android.testutils.parcelingRoundTrip import com.android.testutils.parcelingRoundTrip
import java.net.InetAddress import java.net.InetAddress
@@ -41,10 +41,6 @@ class NattKeepalivePacketDataTest {
@Rule @JvmField @Rule @JvmField
val ignoreRule: DevSdkIgnoreRule = DevSdkIgnoreRule() val ignoreRule: DevSdkIgnoreRule = DevSdkIgnoreRule()
/* Refer to the definition in {@code NattKeepalivePacketData} */
private val IPV4_HEADER_LENGTH = 20
private val UDP_HEADER_LENGTH = 8
private val TEST_PORT = 4243 private val TEST_PORT = 4243
private val TEST_PORT2 = 4244 private val TEST_PORT2 = 4244
private val TEST_SRC_ADDRV4 = "198.168.0.2".address() private val TEST_SRC_ADDRV4 = "198.168.0.2".address()
@@ -108,4 +104,4 @@ class NattKeepalivePacketDataTest {
fun testHashCode() { fun testHashCode() {
assertEquals(nattKeepalivePacket().hashCode(), nattKeepalivePacket().hashCode()) assertEquals(nattKeepalivePacket().hashCode(), nattKeepalivePacket().hashCode())
} }
} }