Merge "[FUI15] Remove networkId in NetworkState"

2021-02-20 14:00:19 +00:00
parent 2f435607da 7afe1ddb29
commit 9d8d6ff5c3
4 changed files with 10 additions and 16 deletions
--- a/tests/net/java/android/net/NetworkTemplateTest.kt
+++ b/tests/net/java/android/net/NetworkTemplateTest.kt
@@ -65,7 +65,7 @@ class NetworkTemplateTest {
            setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, true)
            setSSID(ssid)
        }
-        return NetworkState(type, lp, caps, mock(Network::class.java), subscriberId, ssid)
+        return NetworkState(type, lp, caps, mock(Network::class.java), subscriberId)
    }

    private fun NetworkTemplate.assertMatches(ident: NetworkIdentity) =