Remi NGUYEN VAN
44ed85862c
Migrate ICaptivePortal to stable AIDL
...
Also add required API for the captive portal app to stop using hidden
members.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Merged-In: I62b457e709fa199822bb8f80b0eab990be4ded93
Change-Id: I62b457e709fa199822bb8f80b0eab990be4ded93
2019-01-23 00:53:13 +09:00
Lorenzo Colitti
230fad7923
Merge "Migrate ICaptivePortal to stable AIDL"
2019-01-22 15:38:07 +00:00
Pavel Grafov
1ad4ef9385
Merge "Add API for VPN apps to query always-on and lockdown." am: 5e135e2bdc am: d332a50c1f
...
am: 8bfc3feb3f
2019-01-22 07:19:18 -08:00
Pavel Grafov
8bfc3feb3f
Merge "Add API for VPN apps to query always-on and lockdown." am: 5e135e2bdc
...
am: d332a50c1f
2019-01-22 07:09:43 -08:00
Pavel Grafov
d332a50c1f
Merge "Add API for VPN apps to query always-on and lockdown."
...
am: 5e135e2bdc
2019-01-22 07:00:53 -08:00
Pavel Grafov
5e135e2bdc
Merge "Add API for VPN apps to query always-on and lockdown."
2019-01-22 14:43:06 +00:00
Remi NGUYEN VAN
e761c0b364
Migrate ICaptivePortal to stable AIDL
...
Also add required API for the captive portal app to stop using hidden
members.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: I62b457e709fa199822bb8f80b0eab990be4ded93
2019-01-22 21:16:47 +09:00
Remi NGUYEN VAN
049478be96
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b am: d16b91fddd
...
am: 8e3c713db0
2019-01-22 03:54:23 -08:00
Remi NGUYEN VAN
8e3c713db0
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b
...
am: d16b91fddd
2019-01-22 03:27:36 -08:00
Remi NGUYEN VAN
d16b91fddd
Merge "Add LinkProps and NetworkCaps methods to SystemApi"
...
am: 4bde11491b
Change-Id: I7ba317e49a6ad7a7413d9ff4e312aed0b700e695
2019-01-22 03:14:19 -08:00
Chalard Jean
7f8be9f6ca
[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
d943a3ad36
Merge "Add NetworkStack metrics to system API" am: bda2c4fe17 am: 65599b3ca1
...
am: 330a49d63c
2019-01-22 00:28:03 -08:00
Remi NGUYEN VAN
330a49d63c
Merge "Add NetworkStack metrics to system API" am: bda2c4fe17
...
am: 65599b3ca1
2019-01-22 00:18:58 -08:00
Remi NGUYEN VAN
65599b3ca1
Merge "Add NetworkStack metrics to system API"
...
am: bda2c4fe17
2019-01-22 00:09:31 -08:00
Remi NGUYEN VAN
109f8d5585
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
bda2c4fe17
Merge "Add NetworkStack metrics to system API"
2019-01-22 07:48:39 +00:00
Lorenzo Colitti
9484decee4
Merge "Properly expect all callbacks in testStackedLinkProperties." am: 98dda351ac am: 2244ef14a8
...
am: 63b0c7c37f
2019-01-21 23:00:00 -08:00
Lorenzo Colitti
63b0c7c37f
Merge "Properly expect all callbacks in testStackedLinkProperties." am: 98dda351ac
...
am: 2244ef14a8
2019-01-21 22:50:47 -08:00
Lorenzo Colitti
2244ef14a8
Merge "Properly expect all callbacks in testStackedLinkProperties."
...
am: 98dda351ac
2019-01-21 22:41:16 -08:00
Lorenzo Colitti
98dda351ac
Merge "Properly expect all callbacks in testStackedLinkProperties."
2019-01-22 06:31:23 +00:00
Remi NGUYEN VAN
f6907af000
[automerger skipped] Merge "Add NetworkMonitor constants to SystemApi" am: a1e4e0bc23 am: 50cf5400b6
...
am: 54fb67a42e2e4422598d
2019-01-21 19:34:29 -08:00
Remi NGUYEN VAN
54fb67a42e
Merge "Add NetworkMonitor constants to SystemApi" am: a1e4e0bc23
...
am: 50cf5400b6
2019-01-21 19:25:05 -08:00
Remi NGUYEN VAN
50cf5400b6
Merge "Add NetworkMonitor constants to SystemApi"
...
am: a1e4e0bc23
2019-01-21 19:15:59 -08:00
Remi NGUYEN VAN
a1e4e0bc23
Merge "Add NetworkMonitor constants to SystemApi"
2019-01-22 03:03:37 +00:00
Lorenzo Colitti
4433025623
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
d76d1e4921
Merge "Add NetworkMonitor constants to SystemApi"
2019-01-22 01:46:12 +00:00
Remi NGUYEN VAN
fc5fb92ff3
Merge "Add fields used by NetworkStack to the API" am: aa983b7f1c am: cbd795dff7
...
am: b1f5762741
2019-01-21 15:57:53 -08:00
Remi NGUYEN VAN
b1f5762741
Merge "Add fields used by NetworkStack to the API" am: aa983b7f1c
...
am: cbd795dff7
2019-01-21 15:47:28 -08:00
Remi NGUYEN VAN
cbd795dff7
Merge "Add fields used by NetworkStack to the API"
...
am: aa983b7f1c
2019-01-21 15:36:17 -08:00
Remi NGUYEN VAN
c8bf99d5d9
Add NetworkStack metrics to system API
...
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: Ie52c55f248c173e2a5ee603ecd004fbac9004ac1
2019-01-21 23:24:41 +00:00
Remi NGUYEN VAN
aa983b7f1c
Merge "Add fields used by NetworkStack to the API"
2019-01-21 23:20:26 +00:00
Chalard Jean
999ca436ed
Merge changes I2ddfef0c,I49bee0c9 am: 1feafc2e2a am: ae62bfc346
...
am: 16e7e25468
2019-01-21 11:28:55 -08:00
Remi NGUYEN VAN
c3854f96c6
Merge "Add stable AIDL parcelables for IIpClient API" am: 2fd1c3864e am: cfa31032d6
...
am: 8aa71627c2
2019-01-21 11:19:54 -08:00
Chalard Jean
16e7e25468
Merge changes I2ddfef0c,I49bee0c9 am: 1feafc2e2a
...
am: ae62bfc346
2019-01-21 11:18:35 -08:00
Remi NGUYEN VAN
8aa71627c2
Merge "Add stable AIDL parcelables for IIpClient API" am: 2fd1c3864e
...
am: cfa31032d6
2019-01-21 11:09:28 -08:00
Chalard Jean
ae62bfc346
Merge changes I2ddfef0c,I49bee0c9
...
am: 1feafc2e2a
2019-01-21 11:01:47 -08:00
Remi NGUYEN VAN
cfa31032d6
Merge "Add stable AIDL parcelables for IIpClient API"
...
am: 2fd1c3864e
2019-01-21 10:56:19 -08:00
Remi NGUYEN VAN
85b9665073
Add fields used by NetworkStack to the API
...
Test: m
Bug: 112869080
Change-Id: I59f6d5ae8a601b7496548b87f137a577f2365a37
2019-01-21 23:03:25 +09:00
Pavel Grafov
e87b7ceaa6
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
Remi NGUYEN VAN
70ab67f1ce
Add NetworkMonitor constants to SystemApi
...
NetworkMonitor lives in the NetworkStack which must only use system
APIs. This includes constants used by NetworkMonitor and captive portal
login.
Bug: 112869080
Test: m
Merged-In: I8b5f0bb61c3ef0d2f33af7dd67b72ac6c5a1d1b5
Change-Id: I4879568d3fbf9435767c8d4d0ab5198d421a2f4f
2019-01-21 21:11:15 +09:00
Remi NGUYEN VAN
2e4422598d
Add NetworkMonitor constants to SystemApi
...
NetworkMonitor lives in the NetworkStack which must only use system
APIs. This includes constants used by NetworkMonitor and captive portal
login.
Bug: 112869080
Test: m
(Cherry-pick of aosp I4879568d3fbf9435767c8d4d0ab5198d421a2f4f)
Change-Id: I8b5f0bb61c3ef0d2f33af7dd67b72ac6c5a1d1b5
2019-01-21 21:07:10 +09:00
Junyu Lai
70a572a8de
Merge "Remove dead KeepaliveInfo if it cannot be started" am: 8e1e64f928 am: e2c006f40b
...
am: 811b614c5a
2019-01-21 03:05:16 -08:00
Junyu Lai
811b614c5a
Merge "Remove dead KeepaliveInfo if it cannot be started" am: 8e1e64f928
...
am: e2c006f40b
2019-01-21 02:52:21 -08:00
Chalard Jean
1feafc2e2a
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
2fd1c3864e
Merge "Add stable AIDL parcelables for IIpClient API"
2019-01-21 08:01:26 +00:00
Chalard Jean
b8997229ad
[MS08] Read back attributes and blobs.
...
Test: New tests in IpMemoryStore
Bug: 113554482
Change-Id: I2ddfef0c2ed37459c038f75d1dfc92fdefbf58f5
2019-01-21 15:21:09 +09:00
Junyu Lai
e2c006f40b
Merge "Remove dead KeepaliveInfo if it cannot be started"
...
am: 8e1e64f928
2019-01-20 20:09:51 -08:00
Remi NGUYEN VAN
699aefeb81
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
Junyu Lai
8e1e64f928
Merge "Remove dead KeepaliveInfo if it cannot be started"
2019-01-21 03:48:15 +00:00
Josh Gao
5d7a742b8d
Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." am: 5ceb563f51 am: 39ac4fe5bf
...
am: 5363d5be5d
2019-01-18 15:57:06 -08:00
