Roshan Pius fdc5eb6e56 resolve merge conflicts of 403b7fd0b0 to stage-aosp-master ...

Merged-In: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3
Change-Id: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3

2021-03-21 19:20:35 +00:00

..

connectivity

Merge changes from topics "revert-1645768-revert-1626206-replaceUidRange-MSYTKFNGUE-HIUTVTIGIR", "ti_redaction"

2021-03-21 16:41:13 +00:00

net

[FUI09] Expose NetworkStateSnapshot as system API

2021-03-02 23:09:16 +08:00

ConnectivityServiceTest.java

resolve merge conflicts of 403b7fd0b0 to stage-aosp-master

2021-03-21 19:20:35 +00:00

IpSecServiceParameterizedTest.java

Merge changes I852e3a53,I86755647,I0ed8b0c6

2021-02-22 06:49:39 +00:00

IpSecServiceRefcountedResourceTest.java

Remove unused INetworkManagementService from IpSecService

2021-02-08 08:05:00 +00:00

IpSecServiceTest.java

Add a new API to get the network ID range of IPSec tunnel interface

2021-03-12 00:46:33 +08:00

LegacyTypeTrackerTest.kt

Remove usage of networkAttributes

2021-03-16 16:01:40 +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

…