Remi NGUYEN VAN
cef9889b0d
Merge "Add getAvoidBadWifi system API" am: 58582a36fc am: 656f2fa71a
...
am: 3fb943a7b5
Change-Id: I8ff56380368a340162368ccbeefcae6df1ae549f
2019-01-22 18:21:58 -08:00
Remi NGUYEN VAN
3fb943a7b5
Merge "Add getAvoidBadWifi system API" am: 58582a36fc
...
am: 656f2fa71a
Change-Id: Ide4ffc316c9301b795e8c0dabea3322aaf0b3184
2019-01-22 17:53:09 -08:00
Remi NGUYEN VAN
58582a36fc
Merge "Add getAvoidBadWifi system API"
2019-01-23 01:13:01 +00:00
TreeHugger Robot
a3bc64302f
Merge "Remove unused SleepUtils."
2019-01-23 00:35:24 +00:00
Chalard Jean
d068b9302a
Merge changes If71fadd2,I42047185 am: 022daeb874 am: 6d1da29090
...
am: 5da014a5fb
Change-Id: Ia91e6eac1b53fabb018fb4e1f689bb986e895ca4
2019-01-22 15:29:37 -08:00
Chalard Jean
5da014a5fb
Merge changes If71fadd2,I42047185 am: 022daeb874
...
am: 6d1da29090
Change-Id: Id181b0c617c209bdf01ce25a8920d96025f8421d
2019-01-22 15:20:30 -08:00
Chalard Jean
022daeb874
Merge changes If71fadd2,I42047185
...
* changes:
[MS10] Address leftover comments on MS03 and MS07
[MS09] Implement isSameNetwork.
2019-01-22 22:50:21 +00:00
Suren Baghdasaryan
6cc4c4ff65
Merge changes from topic "move sched_policy functions" am: 2a2b4eec35
...
am: ef974c1a36
Change-Id: I571daf3bed2a2145ea85435f6d5a753635cca9f3
2019-01-22 13:55:25 -08:00
Aurimas Liutikas
42249cb7c2
Remove unused SleepUtils.
...
This looks like dead code not used by anything in the tree.
It was added in ag/603441
Test: None
Change-Id: Ic424a25794d7c45719fa4f554cbf4f4b74288065
2019-01-22 13:48:47 -08:00
Suren Baghdasaryan
ced57bb7fc
Add libprocessgroup dependency
...
Because set_sched_policy is moved into libprocessgroup an additional
dependency is required for its users. libframeworksnettestsjni requires
libprocessgroup otherwise com.android.frameworks.tests.net fails with
error:
dlopen failed: library "libprocessgroup.so" not found
Exempt-From-Owner-Approval: janitorial
Bug: 111307099
Test: builds, boots
Merged-In: Ia8bc5b447efa568fd1c822746919fa1496cc42a6
Change-Id: Ia8bc5b447efa568fd1c822746919fa1496cc42a6
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-01-22 18:16:33 +00:00
Remi NGUYEN VAN
97f69c2f8d
Add getAvoidBadWifi system API
...
This helps remove the dependency on MultinetworkPolicyTracker from
IpClient.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: If56791dbed564772f25a859f301b8b52d84e38a3
2019-01-22 15:57:34 +00:00
Pavel Grafov
18d0de7ecc
Merge "Add API for VPN apps to query always-on and lockdown." am: 479c0769f1 am: 5fb1be5c0b
...
am: 43c0ffc1b1
Change-Id: Ied8e5a01cdf76d8da02d2dc292943e6a559cc84e
2019-01-22 07:19:18 -08:00
Pavel Grafov
43c0ffc1b1
Merge "Add API for VPN apps to query always-on and lockdown." am: 479c0769f1
...
am: 5fb1be5c0b
Change-Id: I48f3441f06af2a69776eacc5ee52463873739bdb
2019-01-22 07:09:43 -08:00
Pavel Grafov
479c0769f1
Merge "Add API for VPN apps to query always-on and lockdown."
2019-01-22 14:43:06 +00:00
Remi NGUYEN VAN
75df50dc83
Merge "Remove InterfaceController dependency on NMS" am: 06adb08d27 am: b6eb7e19e2
...
am: f012b976f9
Change-Id: I7916f77c66d928bd1b1dd5616f2a478119263f2a
2019-01-22 05:43:59 -08:00
Remi NGUYEN VAN
f012b976f9
Merge "Remove InterfaceController dependency on NMS" am: 06adb08d27
...
am: b6eb7e19e2
Change-Id: I432d8f625057a3e3e35e12910fc48319c723295e
2019-01-22 05:34:33 -08:00
Remi NGUYEN VAN
06adb08d27
Merge "Remove InterfaceController dependency on NMS"
2019-01-22 13:14:06 +00:00
Remi NGUYEN VAN
0a0dc38d8a
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b am: 563c545187
...
am: 4293455fd1
Change-Id: I7e5a733b5c581679c0e50015205d9b8a3a2e8df2
2019-01-22 03:54:23 -08:00
Remi NGUYEN VAN
4293455fd1
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b
...
am: 563c545187
Change-Id: Ic15474fe0b7da8062114367ec4f692e30e73d549
2019-01-22 03:27:36 -08:00
Remi NGUYEN VAN
d1b51a3228
Remove InterfaceController dependency on NMS
...
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: Ib3773068b087f58f4ac3394291cda132b00b2dcc
2019-01-22 20:25:48 +09:00
Chalard Jean
b67e493653
[MS10] Address leftover comments on MS03 and MS07
...
- Fix the copyright year in IPMSDatabase.java.
- Add missing Override annotations.
- Remove random l2keys, use fixed strings.
- Rename the method in OnNetworkAttributesRetrieved that puzzlingly
nobody noticed was wrong.
Test: atest IpMemoryStoreServiceTest
Bug: 113554482
Change-Id: If71fadd23e158a4be299d112bfce75690b1ed8e8
2019-01-22 19:10:48 +09:00
Chalard Jean
a39756a58a
[MS09] Implement isSameNetwork.
...
Test: Old tests pass, new tests pass too.
Bug: 113554482
Change-Id: I420471853f3fab7725cba7ae500cebdce1912e43
2019-01-22 19:10:48 +09:00
Remi NGUYEN VAN
007322ecac
Merge "Add NetworkStack metrics to system API" am: 8586a43f31 am: 2aa1bbe018
...
am: 2f58858d1a
Change-Id: I848ac4c2bb8d35a2f756f97e57f9a61698c00f57
2019-01-22 00:28:03 -08:00
Remi NGUYEN VAN
2f58858d1a
Merge "Add NetworkStack metrics to system API" am: 8586a43f31
...
am: 2aa1bbe018
Change-Id: I8d711dcf76935d28d8a610d6a18da77cea77268e
2019-01-22 00:18:58 -08:00
Remi NGUYEN VAN
94a055737e
Add LinkProps and NetworkCaps methods to SystemApi
...
Added methods are used by the NetworkStack.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: I8822d43c1a4981ca39289525685b3f975fb0e8d5
2019-01-22 16:57:16 +09:00
Remi NGUYEN VAN
8586a43f31
Merge "Add NetworkStack metrics to system API"
2019-01-22 07:48:39 +00:00
Remi NGUYEN VAN
8bddc8fc4e
Merge "Fix lint errors for moving IpClient to NetworkStack" am: 9325fbc4f8 am: 3d7914e98b
...
am: cd2dc71a8a
Change-Id: Iea48be6bcfca67cf702b2bb3f4b0ed5f44ec40eb
2019-01-21 23:40:32 -08:00
Remi NGUYEN VAN
cd2dc71a8a
Merge "Fix lint errors for moving IpClient to NetworkStack" am: 9325fbc4f8
...
am: 3d7914e98b
Change-Id: I5c9b6f7ea680b151d6ba87007ddc6da34036e256
2019-01-21 23:31:02 -08:00
Remi NGUYEN VAN
9325fbc4f8
Merge "Fix lint errors for moving IpClient to NetworkStack"
2019-01-22 07:13:39 +00:00
Lorenzo Colitti
5c1fb26b3b
Merge "Properly expect all callbacks in testStackedLinkProperties." am: a1b2a93273 am: 2f4c32bc50
...
am: 79489fa542
Change-Id: I615f412f7696752d867337ab5cbabe24daea2ed3
2019-01-21 23:00:00 -08:00
Lorenzo Colitti
79489fa542
Merge "Properly expect all callbacks in testStackedLinkProperties." am: a1b2a93273
...
am: 2f4c32bc50
Change-Id: I9b066e4242d52f917e36a05911bdcd843c3f5c84
2019-01-21 22:50:47 -08:00
Lorenzo Colitti
a1b2a93273
Merge "Properly expect all callbacks in testStackedLinkProperties."
2019-01-22 06:31:23 +00:00
Remi NGUYEN VAN
e7e9f2befe
Fix lint errors for moving IpClient to NetworkStack
...
Test: checklint at upload, m
Bug: 112869080
Change-Id: I82fb9c9037cc0a9d3c80958d64552ff1ef0a90ab
2019-01-22 13:12:08 +09:00
Lorenzo Colitti
2412c13c34
Properly expect all callbacks in testStackedLinkProperties.
...
Currently testStackedLinkProperties accounts for some of the
NetworkCallbacks that are fired, but not all of them. The test
passes because it only ever expects LinkProperties changed
callbacks (and not, e.g., lost callbacks), because it uses
waitForIdle(), and because at the end, when the callback is
unregistered, it does not call assertNoCallback().
Add the missing callback expectation and expect a LOST callback
at the end. Also add an assertNoCallback, even though it's not
strictly necessary. Remove all the waitForIdle statements, which
are no longer necessary because every assertion happens after
waiting for a callback.
Making the expectations more precise in a separate CL will help
ensure that upcoming changes to this code don't break anything,
and will make said changes easier to review.
Bug: 65674744
Test: atest FrameworksNetTests
Test: ConnectivityServiceTest#testStackedLinkProperties passes 400 times
Change-Id: I73cda0dd029a0e6546f7272beedf841ce5a4c0dc
2019-01-22 10:53:00 +09:00
Remi NGUYEN VAN
4603a03993
Merge "Add IIpClient API for IpClient" am: 60b9ad2ec3 am: e89f53330a
...
am: a359fc3948
Change-Id: Icbbbd2c5db729210735c0bcb415b9c4025d852e0
2019-01-21 17:41:49 -08:00
Remi NGUYEN VAN
a359fc3948
Merge "Add IIpClient API for IpClient" am: 60b9ad2ec3
...
am: e89f53330a
Change-Id: I58d8725a1f43f42d364a53ca80d86e3f65e6cf63
2019-01-21 17:32:12 -08:00
Remi NGUYEN VAN
60b9ad2ec3
Merge "Add IIpClient API for IpClient"
2019-01-22 01:10:17 +00:00
Remi NGUYEN VAN
7b84fb336f
Add NetworkStack metrics to system API
...
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: Ie52c55f248c173e2a5ee603ecd004fbac9004ac1
2019-01-21 23:24:41 +00:00
Chalard Jean
75437d2310
Merge changes I2ddfef0c,I49bee0c9 am: ca046e898b am: a6109ea3a0
...
am: 39f2eb4abd
Change-Id: I369bf5d92a3f70e789043d33bcbc85099aebbb69
2019-01-21 11:28:55 -08:00
Remi NGUYEN VAN
96892aae33
Merge "Add stable AIDL parcelables for IIpClient API" am: 7bf90a1f97 am: 4294a0f939
...
am: bba39913f8
Change-Id: Ieac619f043a7142cbbec3eaec334b7fac97ce7fc
2019-01-21 11:19:54 -08:00
Chalard Jean
39f2eb4abd
Merge changes I2ddfef0c,I49bee0c9 am: ca046e898b
...
am: a6109ea3a0
Change-Id: I552730badc910df5f5a48c2ded6566071b604783
2019-01-21 11:18:35 -08:00
Remi NGUYEN VAN
bba39913f8
Merge "Add stable AIDL parcelables for IIpClient API" am: 7bf90a1f97
...
am: 4294a0f939
Change-Id: Ifae5ae9e6e396452ce4c432d8aa613d03ba59824
2019-01-21 11:09:28 -08:00
Pavel Grafov
cb3b895f1d
Add API for VPN apps to query always-on and lockdown.
...
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Bug: 72628179
Change-Id: I73cb0888f7049b12ab0cdfa62678c3846e074d3b
2019-01-21 13:48:45 +00:00
Chalard Jean
ca046e898b
Merge changes I2ddfef0c,I49bee0c9
...
* changes:
[MS08] Read back attributes and blobs.
[MS07] Implement storeNetworkAttributes and storeBlob.
2019-01-21 09:34:41 +00:00
Remi NGUYEN VAN
a5d31f53b6
Add IIpClient API for IpClient
...
The API will be used to interact with IpClient once it is moved to the
NetworkStack process.
This change keeps compatibility with the previous API so that clients
can be migrated independently.
Test: atest FrameworksNetTests NetworkStackTests
Bug: b/112869080
Change-Id: I57d8164afae849230bbc0e25f17859c0b22d0f29
2019-01-21 18:25:46 +09:00
Chalard Jean
bf73e66d4d
[MS08] Read back attributes and blobs.
...
Test: New tests in IpMemoryStore
Bug: 113554482
Change-Id: I2ddfef0c2ed37459c038f75d1dfc92fdefbf58f5
2019-01-21 15:21:09 +09:00
Chalard Jean
91549b6d1b
[MS07] Implement storeNetworkAttributes and storeBlob.
...
Test: New tests in IpMemoryStore
Bug: 113554482
Change-Id: I49bee0c903247e77ab93517efbe44548313cf1a4
2019-01-21 15:21:09 +09:00
Remi NGUYEN VAN
6b0b2b735e
Add stable AIDL parcelables for IIpClient API
...
Test: atest FrameworksNetTests NetworkStackTests
Bug: b/112869080
Change-Id: Ia4ac1eb482850a06c4dc1b6c1fe55d33d4087388
2019-01-21 12:54:24 +09:00
Suren Baghdasaryan
6c0f11310a
Merge "Add libprocessgroup dependency"
2019-01-19 00:39:13 +00:00
Josh Gao
d9e487b4e9
Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." am: 35c5160492 am: e7ca44fd49
...
am: 35ddfca938
Change-Id: I34e6480f42957da27aeb6f8ccc6bd91d2304e590
2019-01-18 15:57:06 -08:00