Lorenzo Colitti
6176dbe176
Fix merge conflict.
...
ag/13210542 was submitted directly into internal and is causing
a merge conflict in NetworkNotificationManagerTest.
Fix the conflict by adding the unused imports.
Test: m
Bug: 175409684
Change-Id: I6eec459a5e5b9900ddeb9e17d90f07432eee1394
2021-02-17 20:22:35 +09:00
..
connectivity
Fix merge conflict.
2021-02-17 20:22:35 +09:00
net
[FUI07] Stop making NetworkState with NetworkInfo from external callers
2021-02-08 21:58:02 +08:00
ConnectivityServiceTest.java
Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu...""
2021-02-15 11:39:25 +00:00
IpSecServiceParameterizedTest.java
Update underlying network of IpSecTunnelInterface
2021-02-10 14:51:43 -08:00
IpSecServiceRefcountedResourceTest.java
Automatically set IPsec tunnel interface as up
2020-03-25 06:14:13 +00:00
IpSecServiceTest.java
Automatically set IPsec tunnel interface as up
2020-03-25 06:14:13 +00:00
LegacyTypeTrackerTest.kt
Revert the fallback naming into default network
2021-02-04 13:14:05 +09:00
NetIdManagerTest.kt
Move utils from network stack to libs.
2020-07-29 21:15:48 +09:00
NetworkManagementServiceTest.java
Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged"
2020-12-28 01:05:28 +00:00
NsdServiceTest.java
Migrate frameworks/base/tests/net/ to androidx.test
2019-03-05 09:05:47 -08:00