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

wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key

Browse Source 
1. Used SSID to be a wifi network identity can't separate wifi
data usage when there are two different network with same SSID.
Use a new usage key from in WifiInfo to replace wifi SSID to
solve this issue.

2. To support to query wifi usage per configured Wifi network.
Adding matchWifiNetworkKeys in NetworkTemplate to support querying
multi networkKeys wifi data usage since each configured Wifi
network configuration might be used to connect different Wifi
network.

a. Replaced wording SSID with key of the wifi network
b. Add mock to handle get wifi network key from WifiInfo
c. Add null/empty set unit test to verify matchWifiNetworkKeys

Bug: 197520752
Bug: 126299427
Test: atest -c NetworkTemplateTest
Test: atest -c NetworkStatsServiceTest
Test: atest -c NetworkPolicyManagerServiceTest
Change-Id: Id7d66f6548dd1b4e657db8d7427213293618b406
This commit is contained in:
Les Lee
2021-12-10 00:08:13 +08:00
parent 3763316aeb
commit c728c36ca7
2 changed files with 188 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

280
tests/unit/java/android/net/NetworkTemplateTest.kt
View File

@@ -50,6 +50,7 @@ import android.net.NetworkTemplate.buildTemplateMobileWithRatType
import android.net.NetworkTemplate.buildTemplateWifi import android.net.NetworkTemplate.buildTemplateWifi
import android.net.NetworkTemplate.buildTemplateWifiWildcard import android.net.NetworkTemplate.buildTemplateWifiWildcard
import android.net.NetworkTemplate.normalize import android.net.NetworkTemplate.normalize
import android.net.wifi.WifiInfo
import android.os.Build import android.os.Build
import android.telephony.TelephonyManager import android.telephony.TelephonyManager
import com.android.net.module.util.NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_ALL import com.android.net.module.util.NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_ALL
@@ -61,6 +62,7 @@ import org.junit.Before
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mockito.Mockito.mock import org.mockito.Mockito.mock
import org.mockito.Mockito.`when`
import org.mockito.MockitoAnnotations import org.mockito.MockitoAnnotations
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertFailsWith import kotlin.test.assertFailsWith
@@ -71,35 +73,38 @@ import kotlin.test.assertTrue
private const val TEST_IMSI1 = "imsi1" private const val TEST_IMSI1 = "imsi1"
private const val TEST_IMSI2 = "imsi2" private const val TEST_IMSI2 = "imsi2"
private const val TEST_IMSI3 = "imsi3" private const val TEST_IMSI3 = "imsi3"
private const val TEST_SSID1 = "ssid1" private const val TEST_WIFI_KEY1 = "wifiKey1"
private const val TEST_SSID2 = "ssid2" private const val TEST_WIFI_KEY2 = "wifiKey2"
@RunWith(DevSdkIgnoreRunner::class) @RunWith(DevSdkIgnoreRunner::class)
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R)
class NetworkTemplateTest { class NetworkTemplateTest {
private val mockContext = mock(Context::class.java) private val mockContext = mock(Context::class.java)
private val mockWifiInfo = mock(WifiInfo::class.java)
private fun buildMobileNetworkState(subscriberId: String): NetworkStateSnapshot = private fun buildMobileNetworkState(subscriberId: String): NetworkStateSnapshot =
buildNetworkState(TYPE_MOBILE, subscriberId = subscriberId) buildNetworkState(TYPE_MOBILE, subscriberId = subscriberId)
private fun buildWifiNetworkState(subscriberId: String?, ssid: String?): NetworkStateSnapshot = private fun buildWifiNetworkState(subscriberId: String?, wifiKey: String?):
buildNetworkState(TYPE_WIFI, subscriberId = subscriberId, ssid = ssid) NetworkStateSnapshot = buildNetworkState(TYPE_WIFI,
subscriberId = subscriberId, wifiKey = wifiKey)
private fun buildNetworkState( private fun buildNetworkState(
type: Int, type: Int,
subscriberId: String? = null, subscriberId: String? = null,
ssid: String? = null, wifiKey: String? = null,
oemManaged: Int = OEM_NONE, oemManaged: Int = OEM_NONE,
metered: Boolean = true metered: Boolean = true
): NetworkStateSnapshot { ): NetworkStateSnapshot {
`when`(mockWifiInfo.getCurrentNetworkKey()).thenReturn(wifiKey)
val lp = LinkProperties() val lp = LinkProperties()
val caps = NetworkCapabilities().apply { val caps = NetworkCapabilities().apply {
setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED, !metered) setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED, !metered)
setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, true) setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, true)
setSSID(ssid)
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PAID, setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PAID,
(oemManaged and OEM_PAID) == OEM_PAID) (oemManaged and OEM_PAID) == OEM_PAID)
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE, setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE,
(oemManaged and OEM_PRIVATE) == OEM_PRIVATE) (oemManaged and OEM_PRIVATE) == OEM_PRIVATE)
setTransportInfo(mockWifiInfo)
} }
return NetworkStateSnapshot(mock(Network::class.java), caps, lp, subscriberId, type) return NetworkStateSnapshot(mock(Network::class.java), caps, lp, subscriberId, type)
} }
@@ -122,64 +127,65 @@ class NetworkTemplateTest {
val identMobileImsi1 = buildNetworkIdentity(mockContext, val identMobileImsi1 = buildNetworkIdentity(mockContext,
buildMobileNetworkState(TEST_IMSI1), buildMobileNetworkState(TEST_IMSI1),
false, TelephonyManager.NETWORK_TYPE_UMTS) false, TelephonyManager.NETWORK_TYPE_UMTS)
val identWifiImsiNullSsid1 = buildNetworkIdentity( val identWifiImsiNullKey1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(null, TEST_SSID1), true, 0) mockContext, buildWifiNetworkState(null, TEST_WIFI_KEY1), true, 0)
val identWifiImsi1Ssid1 = buildNetworkIdentity( val identWifiImsi1Key1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_SSID1), true, 0) mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_WIFI_KEY1), true, 0)
templateWifiWildcard.assertDoesNotMatch(identMobileImsi1) templateWifiWildcard.assertDoesNotMatch(identMobileImsi1)
templateWifiWildcard.assertMatches(identWifiImsiNullSsid1) templateWifiWildcard.assertMatches(identWifiImsiNullKey1)
templateWifiWildcard.assertMatches(identWifiImsi1Ssid1) templateWifiWildcard.assertMatches(identWifiImsi1Key1)
} }
@Test @Test
fun testWifiMatches() { fun testWifiMatches() {
val templateWifiSsid1 = buildTemplateWifi(TEST_SSID1) val templateWifiKey1 = buildTemplateWifi(TEST_WIFI_KEY1)
val templateWifiSsid1ImsiNull = buildTemplateWifi(TEST_SSID1, null) val templateWifiKey1ImsiNull = buildTemplateWifi(TEST_WIFI_KEY1, null)
val templateWifiSsid1Imsi1 = buildTemplateWifi(TEST_SSID1, TEST_IMSI1) val templateWifiKey1Imsi1 = buildTemplateWifi(TEST_WIFI_KEY1, TEST_IMSI1)
val templateWifiSsidAllImsi1 = buildTemplateWifi(WIFI_NETWORK_KEY_ALL, TEST_IMSI1) val templateWifiKeyAllImsi1 = buildTemplateWifi(WIFI_NETWORK_KEY_ALL, TEST_IMSI1)
val identMobile1 = buildNetworkIdentity(mockContext, buildMobileNetworkState(TEST_IMSI1), val identMobile1 = buildNetworkIdentity(mockContext, buildMobileNetworkState(TEST_IMSI1),
false, TelephonyManager.NETWORK_TYPE_UMTS) false, TelephonyManager.NETWORK_TYPE_UMTS)
val identWifiImsiNullSsid1 = buildNetworkIdentity( val identWifiImsiNullKey1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(null, TEST_SSID1), true, 0) mockContext, buildWifiNetworkState(null, TEST_WIFI_KEY1), true, 0)
val identWifiImsi1Ssid1 = buildNetworkIdentity( val identWifiImsi1Key1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_SSID1), true, 0) mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_WIFI_KEY1), true, 0)
val identWifiImsi2Ssid1 = buildNetworkIdentity( val identWifiImsi2Key1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI2, TEST_SSID1), true, 0) mockContext, buildWifiNetworkState(TEST_IMSI2, TEST_WIFI_KEY1), true, 0)
val identWifiImsi1Ssid2 = buildNetworkIdentity( val identWifiImsi1Key2 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_SSID2), true, 0) mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_WIFI_KEY2), true, 0)
// Verify that template with SSID only matches any subscriberId and specific SSID. // Verify that template with WiFi Network Key only matches any subscriberId and
templateWifiSsid1.assertDoesNotMatch(identMobile1) // specific WiFi Network Key.
templateWifiSsid1.assertMatches(identWifiImsiNullSsid1) templateWifiKey1.assertDoesNotMatch(identMobile1)
templateWifiSsid1.assertMatches(identWifiImsi1Ssid1) templateWifiKey1.assertMatches(identWifiImsiNullKey1)
templateWifiSsid1.assertMatches(identWifiImsi2Ssid1) templateWifiKey1.assertMatches(identWifiImsi1Key1)
templateWifiSsid1.assertDoesNotMatch(identWifiImsi1Ssid2) templateWifiKey1.assertMatches(identWifiImsi2Key1)
templateWifiKey1.assertDoesNotMatch(identWifiImsi1Key2)
// Verify that template with SSID1 and null imsi matches any network with // Verify that template with WiFi Network Key1 and null imsi matches any network with
// SSID1 and null imsi. // WiFi Network Key1 and null imsi.
templateWifiSsid1ImsiNull.assertDoesNotMatch(identMobile1) templateWifiKey1ImsiNull.assertDoesNotMatch(identMobile1)
templateWifiSsid1ImsiNull.assertMatches(identWifiImsiNullSsid1) templateWifiKey1ImsiNull.assertMatches(identWifiImsiNullKey1)
templateWifiSsid1ImsiNull.assertDoesNotMatch(identWifiImsi1Ssid1) templateWifiKey1ImsiNull.assertDoesNotMatch(identWifiImsi1Key1)
templateWifiSsid1ImsiNull.assertDoesNotMatch(identWifiImsi2Ssid1) templateWifiKey1ImsiNull.assertDoesNotMatch(identWifiImsi2Key1)
templateWifiSsid1ImsiNull.assertDoesNotMatch(identWifiImsi1Ssid2) templateWifiKey1ImsiNull.assertDoesNotMatch(identWifiImsi1Key2)
// Verify that template with SSID1 and imsi1 matches any network with // Verify that template with WiFi Network Key1 and imsi1 matches any network with
// SSID1 and imsi1. // WiFi Network Key1 and imsi1.
templateWifiSsid1Imsi1.assertDoesNotMatch(identMobile1) templateWifiKey1Imsi1.assertDoesNotMatch(identMobile1)
templateWifiSsid1Imsi1.assertDoesNotMatch(identWifiImsiNullSsid1) templateWifiKey1Imsi1.assertDoesNotMatch(identWifiImsiNullKey1)
templateWifiSsid1Imsi1.assertMatches(identWifiImsi1Ssid1) templateWifiKey1Imsi1.assertMatches(identWifiImsi1Key1)
templateWifiSsid1Imsi1.assertDoesNotMatch(identWifiImsi2Ssid1) templateWifiKey1Imsi1.assertDoesNotMatch(identWifiImsi2Key1)
templateWifiSsid1Imsi1.assertDoesNotMatch(identWifiImsi1Ssid2) templateWifiKey1Imsi1.assertDoesNotMatch(identWifiImsi1Key2)
// Verify that template with SSID all and imsi1 matches any network with // Verify that template with WiFi Network Key all and imsi1 matches any network with
// any SSID and imsi1. // any WiFi Network Key and imsi1.
templateWifiSsidAllImsi1.assertDoesNotMatch(identMobile1) templateWifiKeyAllImsi1.assertDoesNotMatch(identMobile1)
templateWifiSsidAllImsi1.assertDoesNotMatch(identWifiImsiNullSsid1) templateWifiKeyAllImsi1.assertDoesNotMatch(identWifiImsiNullKey1)
templateWifiSsidAllImsi1.assertMatches(identWifiImsi1Ssid1) templateWifiKeyAllImsi1.assertMatches(identWifiImsi1Key1)
templateWifiSsidAllImsi1.assertDoesNotMatch(identWifiImsi2Ssid1) templateWifiKeyAllImsi1.assertDoesNotMatch(identWifiImsi2Key1)
templateWifiSsidAllImsi1.assertMatches(identWifiImsi1Ssid2) templateWifiKeyAllImsi1.assertMatches(identWifiImsi1Key2)
} }
@Test @Test
@@ -188,7 +194,7 @@ class NetworkTemplateTest {
val templateMobileImsi2WithRatType = buildTemplateMobileWithRatType(TEST_IMSI2, val templateMobileImsi2WithRatType = buildTemplateMobileWithRatType(TEST_IMSI2,
TelephonyManager.NETWORK_TYPE_UMTS, METERED_YES) TelephonyManager.NETWORK_TYPE_UMTS, METERED_YES)
val mobileImsi1 = buildNetworkState(TYPE_MOBILE, TEST_IMSI1, null /* ssid */, val mobileImsi1 = buildNetworkState(TYPE_MOBILE, TEST_IMSI1, null /* wifiKey */,
OEM_NONE, true /* metered */) OEM_NONE, true /* metered */)
val identMobile1 = buildNetworkIdentity(mockContext, mobileImsi1, val identMobile1 = buildNetworkIdentity(mockContext, mobileImsi1,
false /* defaultNetwork */, TelephonyManager.NETWORK_TYPE_UMTS) false /* defaultNetwork */, TelephonyManager.NETWORK_TYPE_UMTS)
@@ -196,8 +202,8 @@ class NetworkTemplateTest {
val identMobile2Umts = buildNetworkIdentity(mockContext, mobileImsi2, val identMobile2Umts = buildNetworkIdentity(mockContext, mobileImsi2,
false /* defaultNetwork */, TelephonyManager.NETWORK_TYPE_UMTS) false /* defaultNetwork */, TelephonyManager.NETWORK_TYPE_UMTS)
val identWifiImsi1Ssid1 = buildNetworkIdentity( val identWifiImsi1Key1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_SSID1), true, 0) mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_WIFI_KEY1), true, 0)
// Verify that the template matches type and the subscriberId. // Verify that the template matches type and the subscriberId.
templateMobileImsi1.assertMatches(identMobile1) templateMobileImsi1.assertMatches(identMobile1)
@@ -208,7 +214,7 @@ class NetworkTemplateTest {
templateMobileImsi2WithRatType.assertDoesNotMatch(identMobile1) templateMobileImsi2WithRatType.assertDoesNotMatch(identMobile1)
// Verify that the different type does not match. // Verify that the different type does not match.
templateMobileImsi1.assertDoesNotMatch(identWifiImsi1Ssid1) templateMobileImsi1.assertDoesNotMatch(identWifiImsi1Key1)
} }
@Test @Test
@@ -225,12 +231,12 @@ class NetworkTemplateTest {
templateMobileWildcard.assertMatches(identMobile1) templateMobileWildcard.assertMatches(identMobile1)
templateMobileNullImsiWithRatType.assertMatches(identMobile1) templateMobileNullImsiWithRatType.assertMatches(identMobile1)
val identWifiImsi1Ssid1 = buildNetworkIdentity( val identWifiImsi1Key1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_SSID1), true, 0) mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_WIFI_KEY1), true, 0)
// Verify that the different type does not match. // Verify that the different type does not match.
templateMobileWildcard.assertDoesNotMatch(identWifiImsi1Ssid1) templateMobileWildcard.assertDoesNotMatch(identWifiImsi1Key1)
templateMobileNullImsiWithRatType.assertDoesNotMatch(identWifiImsi1Ssid1) templateMobileNullImsiWithRatType.assertDoesNotMatch(identWifiImsi1Key1)
} }
@Test @Test
@@ -238,13 +244,14 @@ class NetworkTemplateTest {
val templateCarrierImsi1Metered = buildTemplateCarrierMetered(TEST_IMSI1) val templateCarrierImsi1Metered = buildTemplateCarrierMetered(TEST_IMSI1)
val mobileImsi1 = buildMobileNetworkState(TEST_IMSI1) val mobileImsi1 = buildMobileNetworkState(TEST_IMSI1)
val mobileImsi1Unmetered = buildNetworkState(TYPE_MOBILE, TEST_IMSI1, null /* ssid */, val mobileImsi1Unmetered = buildNetworkState(TYPE_MOBILE, TEST_IMSI1,
OEM_NONE, false /* metered */) null /* wifiKey */, OEM_NONE, false /* metered */)
val mobileImsi2 = buildMobileNetworkState(TEST_IMSI2) val mobileImsi2 = buildMobileNetworkState(TEST_IMSI2)
val wifiSsid1 = buildWifiNetworkState(null /* subscriberId */, TEST_SSID1) val wifiKey1 = buildWifiNetworkState(null /* subscriberId */,
val wifiImsi1Ssid1 = buildWifiNetworkState(TEST_IMSI1, TEST_SSID1) TEST_WIFI_KEY1)
val wifiImsi1Ssid1Unmetered = buildNetworkState(TYPE_WIFI, TEST_IMSI1, TEST_SSID1, val wifiImsi1Key1 = buildWifiNetworkState(TEST_IMSI1, TEST_WIFI_KEY1)
OEM_NONE, false /* metered */) val wifiImsi1Key1Unmetered = buildNetworkState(TYPE_WIFI, TEST_IMSI1,
TEST_WIFI_KEY1, OEM_NONE, false /* metered */)
val identMobileImsi1Metered = buildNetworkIdentity(mockContext, val identMobileImsi1Metered = buildNetworkIdentity(mockContext,
mobileImsi1, false /* defaultNetwork */, TelephonyManager.NETWORK_TYPE_UMTS) mobileImsi1, false /* defaultNetwork */, TelephonyManager.NETWORK_TYPE_UMTS)
@@ -253,17 +260,17 @@ class NetworkTemplateTest {
TelephonyManager.NETWORK_TYPE_UMTS) TelephonyManager.NETWORK_TYPE_UMTS)
val identMobileImsi2Metered = buildNetworkIdentity(mockContext, val identMobileImsi2Metered = buildNetworkIdentity(mockContext,
mobileImsi2, false /* defaultNetwork */, TelephonyManager.NETWORK_TYPE_UMTS) mobileImsi2, false /* defaultNetwork */, TelephonyManager.NETWORK_TYPE_UMTS)
val identWifiSsid1Metered = buildNetworkIdentity( val identWifiKey1Metered = buildNetworkIdentity(
mockContext, wifiSsid1, true /* defaultNetwork */, 0 /* subType */) mockContext, wifiKey1, true /* defaultNetwork */, 0 /* subType */)
val identCarrierWifiImsi1Metered = buildNetworkIdentity( val identCarrierWifiImsi1Metered = buildNetworkIdentity(
mockContext, wifiImsi1Ssid1, true /* defaultNetwork */, 0 /* subType */) mockContext, wifiImsi1Key1, true /* defaultNetwork */, 0 /* subType */)
val identCarrierWifiImsi1NonMetered = buildNetworkIdentity(mockContext, val identCarrierWifiImsi1NonMetered = buildNetworkIdentity(mockContext,
wifiImsi1Ssid1Unmetered, true /* defaultNetwork */, 0 /* subType */) wifiImsi1Key1Unmetered, true /* defaultNetwork */, 0 /* subType */)
templateCarrierImsi1Metered.assertMatches(identMobileImsi1Metered) templateCarrierImsi1Metered.assertMatches(identMobileImsi1Metered)
templateCarrierImsi1Metered.assertDoesNotMatch(identMobileImsi1Unmetered) templateCarrierImsi1Metered.assertDoesNotMatch(identMobileImsi1Unmetered)
templateCarrierImsi1Metered.assertDoesNotMatch(identMobileImsi2Metered) templateCarrierImsi1Metered.assertDoesNotMatch(identMobileImsi2Metered)
templateCarrierImsi1Metered.assertDoesNotMatch(identWifiSsid1Metered) templateCarrierImsi1Metered.assertDoesNotMatch(identWifiKey1Metered)
templateCarrierImsi1Metered.assertMatches(identCarrierWifiImsi1Metered) templateCarrierImsi1Metered.assertMatches(identCarrierWifiImsi1Metered)
templateCarrierImsi1Metered.assertDoesNotMatch(identCarrierWifiImsi1NonMetered) templateCarrierImsi1Metered.assertDoesNotMatch(identCarrierWifiImsi1NonMetered)
} }
@@ -273,9 +280,9 @@ class NetworkTemplateTest {
fun testRatTypeGroupMatches() { fun testRatTypeGroupMatches() {
val stateMobileImsi1Metered = buildMobileNetworkState(TEST_IMSI1) val stateMobileImsi1Metered = buildMobileNetworkState(TEST_IMSI1)
val stateMobileImsi1NonMetered = buildNetworkState(TYPE_MOBILE, TEST_IMSI1, val stateMobileImsi1NonMetered = buildNetworkState(TYPE_MOBILE, TEST_IMSI1,
null /* ssid */, OEM_NONE, false /* metered */) null /* wifiKey */, OEM_NONE, false /* metered */)
val stateMobileImsi2NonMetered = buildNetworkState(TYPE_MOBILE, TEST_IMSI2, val stateMobileImsi2NonMetered = buildNetworkState(TYPE_MOBILE, TEST_IMSI2,
null /* ssid */, OEM_NONE, false /* metered */) null /* wifiKey */, OEM_NONE, false /* metered */)
// Build UMTS template that matches mobile identities with RAT in the same // Build UMTS template that matches mobile identities with RAT in the same
// group with any IMSI. See {@link NetworkTemplate#getCollapsedRatType}. // group with any IMSI. See {@link NetworkTemplate#getCollapsedRatType}.
@@ -309,7 +316,7 @@ class NetworkTemplateTest {
val identImsi2UmtsMetered = buildNetworkIdentity(mockContext, val identImsi2UmtsMetered = buildNetworkIdentity(mockContext,
buildMobileNetworkState(TEST_IMSI2), false, TelephonyManager.NETWORK_TYPE_UMTS) buildMobileNetworkState(TEST_IMSI2), false, TelephonyManager.NETWORK_TYPE_UMTS)
val identWifi = buildNetworkIdentity( val identWifi = buildNetworkIdentity(
mockContext, buildWifiNetworkState(null, TEST_SSID1), true, 0) mockContext, buildWifiNetworkState(null, TEST_WIFI_KEY1), true, 0)
val identUmtsNonMetered = buildNetworkIdentity( val identUmtsNonMetered = buildNetworkIdentity(
mockContext, stateMobileImsi1NonMetered, false, TelephonyManager.NETWORK_TYPE_UMTS) mockContext, stateMobileImsi1NonMetered, false, TelephonyManager.NETWORK_TYPE_UMTS)
@@ -397,15 +404,16 @@ class NetworkTemplateTest {
@Test @Test
fun testParcelUnparcel() { fun testParcelUnparcel() {
val templateMobile = NetworkTemplate(MATCH_MOBILE, TEST_IMSI1, null, null, METERED_ALL, val templateMobile = NetworkTemplate(MATCH_MOBILE, TEST_IMSI1, null,
ROAMING_ALL, DEFAULT_NETWORK_ALL, TelephonyManager.NETWORK_TYPE_LTE, arrayOf<String>(), METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL,
TelephonyManager.NETWORK_TYPE_LTE, OEM_MANAGED_ALL,
SUBSCRIBER_ID_MATCH_RULE_EXACT)
val templateWifi = NetworkTemplate(MATCH_WIFI, null, null,
arrayOf(TEST_WIFI_KEY1), METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, 0,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT) OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT)
val templateWifi = NetworkTemplate(MATCH_WIFI, null, null, TEST_SSID1, METERED_ALL, val templateOem = NetworkTemplate(MATCH_MOBILE, null, null,
ROAMING_ALL, DEFAULT_NETWORK_ALL, 0, OEM_MANAGED_ALL, arrayOf<String>(), METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, 0,
SUBSCRIBER_ID_MATCH_RULE_EXACT) OEM_MANAGED_YES, SUBSCRIBER_ID_MATCH_RULE_EXACT)
val templateOem = NetworkTemplate(MATCH_MOBILE, null, null, null, METERED_ALL,
ROAMING_ALL, DEFAULT_NETWORK_ALL, 0, OEM_MANAGED_YES,
SUBSCRIBER_ID_MATCH_RULE_EXACT)
assertParcelSane(templateMobile, 10) assertParcelSane(templateMobile, 10)
assertParcelSane(templateWifi, 10) assertParcelSane(templateWifi, 10)
assertParcelSane(templateOem, 10) assertParcelSane(templateOem, 10)
@@ -443,39 +451,43 @@ class NetworkTemplateTest {
* @param subscriberId To be populated with {@code TEST_IMSI*} only if networkType is * @param subscriberId To be populated with {@code TEST_IMSI*} only if networkType is
* {@code TYPE_MOBILE}. May be left as null when matchType is * {@code TYPE_MOBILE}. May be left as null when matchType is
* {@link NetworkTemplate.MATCH_MOBILE_WILDCARD}. * {@link NetworkTemplate.MATCH_MOBILE_WILDCARD}.
* @param templateSsid Top be populated with {@code TEST_SSID*} only if networkType is * @param templateWifiKey Top be populated with {@code TEST_WIFI_KEY*} only if networkType is
* {@code TYPE_WIFI}. May be left as null when matchType is * {@code TYPE_WIFI}. May be left as null when matchType is
* {@link NetworkTemplate.MATCH_WIFI_WILDCARD}. * {@link NetworkTemplate.MATCH_WIFI_WILDCARD}.
* @param identSsid If networkType is {@code TYPE_WIFI}, this value must *NOT* be null. Provide * @param identWifiKey If networkType is {@code TYPE_WIFI}, this value must *NOT* be null. Provide
* one of {@code TEST_SSID*}. * one of {@code TEST_WIFI_KEY*}.
*/ */
private fun matchOemManagedIdent( private fun matchOemManagedIdent(
networkType: Int, networkType: Int,
matchType: Int, matchType: Int,
subscriberId: String? = null, subscriberId: String? = null,
templateSsid: String? = null, templateWifiKey: String? = null,
identSsid: String? = null identWifiKey: String? = null
) { ) {
val oemManagedStates = arrayOf(OEM_NONE, OEM_PAID, OEM_PRIVATE, OEM_PAID or OEM_PRIVATE) val oemManagedStates = arrayOf(OEM_NONE, OEM_PAID, OEM_PRIVATE, OEM_PAID or OEM_PRIVATE)
val matchSubscriberIds = arrayOf(subscriberId) val matchSubscriberIds = arrayOf(subscriberId)
val matchWifiNetworkKeys = arrayOf(templateWifiKey)
val templateOemYes = NetworkTemplate(matchType, subscriberId, matchSubscriberIds, val templateOemYes = NetworkTemplate(matchType, subscriberId, matchSubscriberIds,
templateSsid, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, matchWifiNetworkKeys, METERED_ALL, ROAMING_ALL,
OEM_MANAGED_YES, SUBSCRIBER_ID_MATCH_RULE_EXACT) DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_MANAGED_YES,
SUBSCRIBER_ID_MATCH_RULE_EXACT)
val templateOemAll = NetworkTemplate(matchType, subscriberId, matchSubscriberIds, val templateOemAll = NetworkTemplate(matchType, subscriberId, matchSubscriberIds,
templateSsid, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, matchWifiNetworkKeys, METERED_ALL, ROAMING_ALL,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT) DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_MANAGED_ALL,
SUBSCRIBER_ID_MATCH_RULE_EXACT)
for (identityOemManagedState in oemManagedStates) { for (identityOemManagedState in oemManagedStates) {
val ident = buildNetworkIdentity(mockContext, buildNetworkState(networkType, val ident = buildNetworkIdentity(mockContext, buildNetworkState(networkType,
subscriberId, identSsid, identityOemManagedState), /*defaultNetwork=*/false, subscriberId, identWifiKey, identityOemManagedState),
/*subType=*/0) /*defaultNetwork=*/false, /*subType=*/0)
// Create a template with each OEM managed type and match it against the NetworkIdentity // Create a template with each OEM managed type and match it against the NetworkIdentity
for (templateOemManagedState in oemManagedStates) { for (templateOemManagedState in oemManagedStates) {
val template = NetworkTemplate(matchType, subscriberId, matchSubscriberIds, val template = NetworkTemplate(matchType, subscriberId, matchSubscriberIds,
templateSsid, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, matchWifiNetworkKeys, METERED_ALL, ROAMING_ALL,
NETWORK_TYPE_ALL, templateOemManagedState, SUBSCRIBER_ID_MATCH_RULE_EXACT) DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, templateOemManagedState,
SUBSCRIBER_ID_MATCH_RULE_EXACT)
if (identityOemManagedState == templateOemManagedState) { if (identityOemManagedState == templateOemManagedState) {
template.assertMatches(ident) template.assertMatches(ident)
} else { } else {
@@ -497,9 +509,10 @@ class NetworkTemplateTest {
fun testOemManagedMatchesIdent() { fun testOemManagedMatchesIdent() {
matchOemManagedIdent(TYPE_MOBILE, MATCH_MOBILE, subscriberId = TEST_IMSI1) matchOemManagedIdent(TYPE_MOBILE, MATCH_MOBILE, subscriberId = TEST_IMSI1)
matchOemManagedIdent(TYPE_MOBILE, MATCH_MOBILE_WILDCARD) matchOemManagedIdent(TYPE_MOBILE, MATCH_MOBILE_WILDCARD)
matchOemManagedIdent(TYPE_WIFI, MATCH_WIFI, templateSsid = TEST_SSID1, matchOemManagedIdent(TYPE_WIFI, MATCH_WIFI, templateWifiKey = TEST_WIFI_KEY1,
identSsid = TEST_SSID1) identWifiKey = TEST_WIFI_KEY1)
matchOemManagedIdent(TYPE_WIFI, MATCH_WIFI_WILDCARD, identSsid = TEST_SSID1) matchOemManagedIdent(TYPE_WIFI, MATCH_WIFI_WILDCARD,
identWifiKey = TEST_WIFI_KEY1)
} }
@Test @Test
@@ -514,12 +527,12 @@ class NetworkTemplateTest {
val identMobileImsi3 = buildNetworkIdentity(mockContext, val identMobileImsi3 = buildNetworkIdentity(mockContext,
buildMobileNetworkState(TEST_IMSI3), false /* defaultNetwork */, buildMobileNetworkState(TEST_IMSI3), false /* defaultNetwork */,
TelephonyManager.NETWORK_TYPE_UMTS) TelephonyManager.NETWORK_TYPE_UMTS)
val identWifiImsi1Ssid1 = buildNetworkIdentity( val identWifiImsi1Key1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_SSID1), true, 0) mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_WIFI_KEY1), true, 0)
val identWifiImsi2Ssid1 = buildNetworkIdentity( val identWifiImsi2Key1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI2, TEST_SSID1), true, 0) mockContext, buildWifiNetworkState(TEST_IMSI2, TEST_WIFI_KEY1), true, 0)
val identWifiImsi3Ssid1 = buildNetworkIdentity( val identWifiImsi3WifiKey1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI3, TEST_SSID1), true, 0) mockContext, buildWifiNetworkState(TEST_IMSI3, TEST_WIFI_KEY1), true, 0)
normalize(buildTemplateMobileAll(TEST_IMSI1), mergedImsiList).also { normalize(buildTemplateMobileAll(TEST_IMSI1), mergedImsiList).also {
it.assertMatches(identMobileImsi1) it.assertMatches(identMobileImsi1)
@@ -531,10 +544,10 @@ class NetworkTemplateTest {
it.assertMatches(identMobileImsi2) it.assertMatches(identMobileImsi2)
it.assertDoesNotMatch(identMobileImsi3) it.assertDoesNotMatch(identMobileImsi3)
} }
normalize(buildTemplateWifi(TEST_SSID1, TEST_IMSI1), mergedImsiList).also { normalize(buildTemplateWifi(TEST_WIFI_KEY1, TEST_IMSI1), mergedImsiList).also {
it.assertMatches(identWifiImsi1Ssid1) it.assertMatches(identWifiImsi1Key1)
it.assertMatches(identWifiImsi2Ssid1) it.assertMatches(identWifiImsi2Key1)
it.assertDoesNotMatch(identWifiImsi3Ssid1) it.assertDoesNotMatch(identWifiImsi3WifiKey1)
} }
normalize(buildTemplateMobileWildcard(), mergedImsiList).also { normalize(buildTemplateMobileWildcard(), mergedImsiList).also {
it.assertMatches(identMobileImsi1) it.assertMatches(identMobileImsi1)
@@ -566,7 +579,7 @@ class NetworkTemplateTest {
NetworkTemplate.Builder(matchRule).setSubscriberIds(setOf(TEST_IMSI1)) NetworkTemplate.Builder(matchRule).setSubscriberIds(setOf(TEST_IMSI1))
.setMeteredness(METERED_YES).build().let { .setMeteredness(METERED_YES).build().let {
val expectedTemplate = NetworkTemplate(matchRule, TEST_IMSI1, val expectedTemplate = NetworkTemplate(matchRule, TEST_IMSI1,
arrayOf(TEST_IMSI1), null, METERED_YES, arrayOf(TEST_IMSI1), arrayOf<String>(), METERED_YES,
ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT) OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT)
assertEquals(expectedTemplate, it) assertEquals(expectedTemplate, it)
@@ -582,7 +595,7 @@ class NetworkTemplateTest {
// regardless of IMSI. See buildTemplateMobileWildcard. // regardless of IMSI. See buildTemplateMobileWildcard.
NetworkTemplate.Builder(MATCH_MOBILE).setMeteredness(METERED_YES).build().let { NetworkTemplate.Builder(MATCH_MOBILE).setMeteredness(METERED_YES).build().let {
val expectedTemplate = NetworkTemplate(MATCH_MOBILE_WILDCARD, null /*subscriberId*/, val expectedTemplate = NetworkTemplate(MATCH_MOBILE_WILDCARD, null /*subscriberId*/,
null /*subscriberIds*/, null /*wifiNetworkKey*/, null /*subscriberIds*/, arrayOf<String>(),
METERED_YES, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, METERED_YES, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_ALL) OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_ALL)
assertEquals(expectedTemplate, it) assertEquals(expectedTemplate, it)
@@ -594,7 +607,7 @@ class NetworkTemplateTest {
.setMeteredness(METERED_YES).setRatType(TelephonyManager.NETWORK_TYPE_UMTS) .setMeteredness(METERED_YES).setRatType(TelephonyManager.NETWORK_TYPE_UMTS)
.build().let { .build().let {
val expectedTemplate = NetworkTemplate(MATCH_MOBILE, TEST_IMSI1, val expectedTemplate = NetworkTemplate(MATCH_MOBILE, TEST_IMSI1,
arrayOf(TEST_IMSI1), null, METERED_YES, arrayOf(TEST_IMSI1), arrayOf<String>(), METERED_YES,
ROAMING_ALL, DEFAULT_NETWORK_ALL, TelephonyManager.NETWORK_TYPE_UMTS, ROAMING_ALL, DEFAULT_NETWORK_ALL, TelephonyManager.NETWORK_TYPE_UMTS,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT) OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT)
assertEquals(expectedTemplate, it) assertEquals(expectedTemplate, it)
@@ -604,7 +617,7 @@ class NetworkTemplateTest {
// regardless of Wifi Network Key. See buildTemplateWifiWildcard and buildTemplateWifi. // regardless of Wifi Network Key. See buildTemplateWifiWildcard and buildTemplateWifi.
NetworkTemplate.Builder(MATCH_WIFI).build().let { NetworkTemplate.Builder(MATCH_WIFI).build().let {
val expectedTemplate = NetworkTemplate(MATCH_WIFI_WILDCARD, null /*subscriberId*/, val expectedTemplate = NetworkTemplate(MATCH_WIFI_WILDCARD, null /*subscriberId*/,
null /*subscriberIds*/, null /*wifiNetworkKey*/, null /*subscriberIds*/, arrayOf<String>(),
METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_ALL) OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_ALL)
assertEquals(expectedTemplate, it) assertEquals(expectedTemplate, it)
@@ -612,9 +625,9 @@ class NetworkTemplateTest {
// Verify template which matches wifi networks with the given Wifi Network Key. // Verify template which matches wifi networks with the given Wifi Network Key.
// See buildTemplateWifi(wifiNetworkKey). // See buildTemplateWifi(wifiNetworkKey).
NetworkTemplate.Builder(MATCH_WIFI).setWifiNetworkKey(TEST_SSID1).build().let { NetworkTemplate.Builder(MATCH_WIFI).setWifiNetworkKeys(setOf(TEST_WIFI_KEY1)).build().let {
val expectedTemplate = NetworkTemplate(MATCH_WIFI, null /*subscriberId*/, val expectedTemplate = NetworkTemplate(MATCH_WIFI, null /*subscriberId*/,
null /*subscriberIds*/, TEST_SSID1, null /*subscriberIds*/, arrayOf(TEST_WIFI_KEY1),
METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_ALL) OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_ALL)
assertEquals(expectedTemplate, it) assertEquals(expectedTemplate, it)
@@ -623,9 +636,9 @@ class NetworkTemplateTest {
// Verify template which matches all wifi networks with the // Verify template which matches all wifi networks with the
// given Wifi Network Key, and IMSI. See buildTemplateWifi(wifiNetworkKey, subscriberId). // given Wifi Network Key, and IMSI. See buildTemplateWifi(wifiNetworkKey, subscriberId).
NetworkTemplate.Builder(MATCH_WIFI).setSubscriberIds(setOf(TEST_IMSI1)) NetworkTemplate.Builder(MATCH_WIFI).setSubscriberIds(setOf(TEST_IMSI1))
.setWifiNetworkKey(TEST_SSID1).build().let { .setWifiNetworkKeys(setOf(TEST_WIFI_KEY1)).build().let {
val expectedTemplate = NetworkTemplate(MATCH_WIFI, TEST_IMSI1, val expectedTemplate = NetworkTemplate(MATCH_WIFI, TEST_IMSI1,
arrayOf(TEST_IMSI1), TEST_SSID1, arrayOf(TEST_IMSI1), arrayOf(TEST_WIFI_KEY1),
METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT) OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT)
assertEquals(expectedTemplate, it) assertEquals(expectedTemplate, it)
@@ -636,11 +649,46 @@ class NetworkTemplateTest {
listOf(MATCH_ETHERNET, MATCH_BLUETOOTH).forEach { matchRule -> listOf(MATCH_ETHERNET, MATCH_BLUETOOTH).forEach { matchRule ->
NetworkTemplate.Builder(matchRule).build().let { NetworkTemplate.Builder(matchRule).build().let {
val expectedTemplate = NetworkTemplate(matchRule, null /*subscriberId*/, val expectedTemplate = NetworkTemplate(matchRule, null /*subscriberId*/,
null /*subscriberIds*/, null /*wifiNetworkKey*/, null /*subscriberIds*/, arrayOf<String>(),
METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_ALL) OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_ALL)
assertEquals(expectedTemplate, it) assertEquals(expectedTemplate, it)
} }
} }
} }
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S)
@Test
fun testBuilderWifiNetworkKeys() {
// Verify template builder which generates same template with the given different
// sequence keys.
NetworkTemplate.Builder(MATCH_WIFI).setWifiNetworkKeys(
setOf(TEST_WIFI_KEY1, TEST_WIFI_KEY2)).build().let {
val expectedTemplate = NetworkTemplate.Builder(MATCH_WIFI).setWifiNetworkKeys(
setOf(TEST_WIFI_KEY2, TEST_WIFI_KEY1)).build()
assertEquals(expectedTemplate, it)
}
// Verify template which matches non-wifi networks with the given key is invalid.
listOf(MATCH_MOBILE, MATCH_CARRIER, MATCH_ETHERNET, MATCH_BLUETOOTH, -1,
Integer.MAX_VALUE).forEach { matchRule ->
assertFailsWith<IllegalArgumentException> {
NetworkTemplate.Builder(matchRule).setWifiNetworkKeys(setOf(TEST_WIFI_KEY1)).build()
}
}
// Verify template which matches wifi networks with the given null key is invalid.
assertFailsWith<IllegalArgumentException> {
NetworkTemplate.Builder(MATCH_WIFI).setWifiNetworkKeys(setOf(null)).build()
}
// Verify template which matches wifi wildcard with the given empty key set.
NetworkTemplate.Builder(MATCH_WIFI).setWifiNetworkKeys(setOf<String>()).build().let {
val expectedTemplate = NetworkTemplate(MATCH_WIFI_WILDCARD, null /*subscriberId*/,
arrayOf<String>() /*subscriberIds*/, arrayOf<String>(),
METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_ALL)
assertEquals(expectedTemplate, it)
}
}
} }

42
tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
View File

@@ -98,6 +98,7 @@ import android.net.NetworkTemplate;
import android.net.TelephonyNetworkSpecifier; import android.net.TelephonyNetworkSpecifier;
import android.net.UnderlyingNetworkInfo; import android.net.UnderlyingNetworkInfo;
import android.net.netstats.provider.INetworkStatsProviderCallback; import android.net.netstats.provider.INetworkStatsProviderCallback;
import android.net.wifi.WifiInfo;
import android.os.Build; import android.os.Build;
import android.os.ConditionVariable; import android.os.ConditionVariable;
import android.os.Handler; import android.os.Handler;
@@ -158,9 +159,9 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
private static final String IMSI_1 = "310004"; private static final String IMSI_1 = "310004";
private static final String IMSI_2 = "310260"; private static final String IMSI_2 = "310260";
private static final String TEST_SSID = "AndroidAP"; private static final String TEST_WIFI_NETWORK_KEY = "WifiNetworkKey";
private static NetworkTemplate sTemplateWifi = buildTemplateWifi(TEST_SSID); private static NetworkTemplate sTemplateWifi = buildTemplateWifi(TEST_WIFI_NETWORK_KEY);
private static NetworkTemplate sTemplateCarrierWifi1 = private static NetworkTemplate sTemplateCarrierWifi1 =
buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, IMSI_1); buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL, IMSI_1);
private static NetworkTemplate sTemplateImsi1 = buildTemplateMobileAll(IMSI_1); private static NetworkTemplate sTemplateImsi1 = buildTemplateMobileAll(IMSI_1);
@@ -181,6 +182,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
private File mStatsDir; private File mStatsDir;
private MockContext mServiceContext; private MockContext mServiceContext;
private @Mock TelephonyManager mTelephonyManager; private @Mock TelephonyManager mTelephonyManager;
private static @Mock WifiInfo sWifiInfo;
private @Mock INetworkManagementService mNetManager; private @Mock INetworkManagementService mNetManager;
private @Mock NetworkStatsFactory mStatsFactory; private @Mock NetworkStatsFactory mStatsFactory;
private @Mock NetworkStatsSettings mSettings; private @Mock NetworkStatsSettings mSettings;
@@ -242,6 +244,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
final Context context = InstrumentationRegistry.getContext(); final Context context = InstrumentationRegistry.getContext();
mServiceContext = new MockContext(context); mServiceContext = new MockContext(context);
when(sWifiInfo.getCurrentNetworkKey()).thenReturn(TEST_WIFI_NETWORK_KEY);
mStatsDir = TestIoUtils.createTemporaryDirectory(getClass().getSimpleName()); mStatsDir = TestIoUtils.createTemporaryDirectory(getClass().getSimpleName());
PowerManager powerManager = (PowerManager) mServiceContext.getSystemService( PowerManager powerManager = (PowerManager) mServiceContext.getSystemService(
@@ -358,7 +361,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
// verify service recorded history // verify service recorded history
assertNetworkTotal(sTemplateCarrierWifi1, 1024L, 1L, 2048L, 2L, 0); assertNetworkTotal(sTemplateCarrierWifi1, 1024L, 1L, 2048L, 2L, 0);
// verify service recorded history for wifi with SSID filter // verify service recorded history for wifi with WiFi Network Key filter
assertNetworkTotal(sTemplateWifi, 1024L, 1L, 2048L, 2L, 0); assertNetworkTotal(sTemplateWifi, 1024L, 1L, 2048L, 2L, 0);
@@ -368,7 +371,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
// verify service recorded history // verify service recorded history
assertNetworkTotal(sTemplateCarrierWifi1, 4096L, 4L, 8192L, 8L, 0); assertNetworkTotal(sTemplateCarrierWifi1, 4096L, 4L, 8192L, 8L, 0);
// verify service recorded history for wifi with SSID filter // verify service recorded history for wifi with WiFi Network Key filter
assertNetworkTotal(sTemplateWifi, 4096L, 4L, 8192L, 8L, 0); assertNetworkTotal(sTemplateWifi, 4096L, 4L, 8192L, 8L, 0);
} }
@@ -774,28 +777,31 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
@Test @Test
public void testMobileStatsOemManaged() throws Exception { public void testMobileStatsOemManaged() throws Exception {
final NetworkTemplate templateOemPaid = new NetworkTemplate(MATCH_MOBILE_WILDCARD, final NetworkTemplate templateOemPaid = new NetworkTemplate(MATCH_MOBILE_WILDCARD,
/*subscriberId=*/null, /*matchSubscriberIds=*/null, /*networkId=*/null, /*subscriberId=*/null, /*matchSubscriberIds=*/null,
METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_PAID, /*matchWifiNetworkKeys=*/new String[0], METERED_ALL, ROAMING_ALL,
SUBSCRIBER_ID_MATCH_RULE_EXACT); DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_PAID, SUBSCRIBER_ID_MATCH_RULE_EXACT);
final NetworkTemplate templateOemPrivate = new NetworkTemplate(MATCH_MOBILE_WILDCARD, final NetworkTemplate templateOemPrivate = new NetworkTemplate(MATCH_MOBILE_WILDCARD,
/*subscriberId=*/null, /*matchSubscriberIds=*/null, /*networkId=*/null, /*subscriberId=*/null, /*matchSubscriberIds=*/null,
METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_PRIVATE, /*matchWifiNetworkKeys=*/new String[0], METERED_ALL, ROAMING_ALL,
SUBSCRIBER_ID_MATCH_RULE_EXACT); DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_PRIVATE, SUBSCRIBER_ID_MATCH_RULE_EXACT);
final NetworkTemplate templateOemAll = new NetworkTemplate(MATCH_MOBILE_WILDCARD, final NetworkTemplate templateOemAll = new NetworkTemplate(MATCH_MOBILE_WILDCARD,
/*subscriberId=*/null, /*matchSubscriberIds=*/null, /*networkId=*/null, /*subscriberId=*/null, /*matchSubscriberIds=*/null,
METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, /*matchWifiNetworkKeys=*/new String[0], METERED_ALL, ROAMING_ALL,
OEM_PAID | OEM_PRIVATE, SUBSCRIBER_ID_MATCH_RULE_EXACT); DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_PAID | OEM_PRIVATE,
SUBSCRIBER_ID_MATCH_RULE_EXACT);
final NetworkTemplate templateOemYes = new NetworkTemplate(MATCH_MOBILE_WILDCARD, final NetworkTemplate templateOemYes = new NetworkTemplate(MATCH_MOBILE_WILDCARD,
/*subscriberId=*/null, /*matchSubscriberIds=*/null, /*networkId=*/null, /*subscriberId=*/null, /*matchSubscriberIds=*/null,
METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_MANAGED_YES, /*matchWifiNetworkKeys=*/new String[0], METERED_ALL, ROAMING_ALL,
DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_MANAGED_YES,
SUBSCRIBER_ID_MATCH_RULE_EXACT); SUBSCRIBER_ID_MATCH_RULE_EXACT);
final NetworkTemplate templateOemNone = new NetworkTemplate(MATCH_MOBILE_WILDCARD, final NetworkTemplate templateOemNone = new NetworkTemplate(MATCH_MOBILE_WILDCARD,
/*subscriberId=*/null, /*matchSubscriberIds=*/null, /*networkId=*/null, /*subscriberId=*/null, /*matchSubscriberIds=*/null,
METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_MANAGED_NO, /*matchWifiNetworkKeys=*/new String[0], METERED_ALL, ROAMING_ALL,
DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_MANAGED_NO,
SUBSCRIBER_ID_MATCH_RULE_EXACT); SUBSCRIBER_ID_MATCH_RULE_EXACT);
// OEM_PAID network comes online. // OEM_PAID network comes online.
@@ -1787,7 +1793,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED, !isMetered); capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED, !isMetered);
capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, true); capabilities.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, true);
capabilities.addTransportType(NetworkCapabilities.TRANSPORT_WIFI); capabilities.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
capabilities.setSSID(TEST_SSID); capabilities.setTransportInfo(sWifiInfo);
return new NetworkStateSnapshot(WIFI_NETWORK, capabilities, prop, subscriberId, TYPE_WIFI); return new NetworkStateSnapshot(WIFI_NETWORK, capabilities, prop, subscriberId, TYPE_WIFI);
} }