Lorenzo Colitti
c66564f296
Merge "Migrate ICaptivePortal to stable AIDL"
2019-01-22 15:38:07 +00:00
Pavel Grafov
833939a5c9
Merge "Add API for VPN apps to query always-on and lockdown." am: c9ea55c3f7 am: 721dbccad1
...
am: ec53cd06b0
Change-Id: Ied8e5a01cdf76d8da02d2dc292943e6a559cc84e
2019-01-22 07:19:18 -08:00
Pavel Grafov
ec53cd06b0
Merge "Add API for VPN apps to query always-on and lockdown." am: c9ea55c3f7
...
am: 721dbccad1
Change-Id: I48f3441f06af2a69776eacc5ee52463873739bdb
2019-01-22 07:09:43 -08:00
Pavel Grafov
721dbccad1
Merge "Add API for VPN apps to query always-on and lockdown."
...
am: c9ea55c3f7
Change-Id: Icb11cdd5c7384eacf1df9b7a0c42e451641f0e04
2019-01-22 07:00:53 -08:00
Pavel Grafov
c9ea55c3f7
Merge "Add API for VPN apps to query always-on and lockdown."
2019-01-22 14:43:06 +00:00
Remi NGUYEN VAN
e0bc140f97
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
125e15852f
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b am: e090d600c5
...
am: 66c8e76081
Change-Id: I7e5a733b5c581679c0e50015205d9b8a3a2e8df2
2019-01-22 03:54:23 -08:00
Remi NGUYEN VAN
66c8e76081
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b
...
am: e090d600c5
Change-Id: Ic15474fe0b7da8062114367ec4f692e30e73d549
2019-01-22 03:27:36 -08:00
Remi NGUYEN VAN
e090d600c5
Merge "Add LinkProps and NetworkCaps methods to SystemApi"
...
am: 4bde11491b
Change-Id: I7ba317e49a6ad7a7413d9ff4e312aed0b700e695
2019-01-22 03:14:19 -08:00
Remi NGUYEN VAN
9cdb11422a
Merge "Add NetworkStack metrics to system API" am: 8fada525d2 am: 2102e2d628
...
am: d093468b8d
Change-Id: I848ac4c2bb8d35a2f756f97e57f9a61698c00f57
2019-01-22 00:28:03 -08:00
Remi NGUYEN VAN
d093468b8d
Merge "Add NetworkStack metrics to system API" am: 8fada525d2
...
am: 2102e2d628
Change-Id: I8d711dcf76935d28d8a610d6a18da77cea77268e
2019-01-22 00:18:58 -08:00
Remi NGUYEN VAN
2102e2d628
Merge "Add NetworkStack metrics to system API"
...
am: 8fada525d2
Change-Id: I686e0ffb8d226d9245f1ef6c04bbc8d586c61e81
2019-01-22 00:09:31 -08:00
Remi NGUYEN VAN
048c9413e6
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
8fada525d2
Merge "Add NetworkStack metrics to system API"
2019-01-22 07:48:39 +00:00
Lorenzo Colitti
4782b60702
Merge "Properly expect all callbacks in testStackedLinkProperties." am: 4129d435c1 am: 6d8a63cf80
...
am: 6fb16a0ef0
Change-Id: I615f412f7696752d867337ab5cbabe24daea2ed3
2019-01-21 23:00:00 -08:00
Lorenzo Colitti
6fb16a0ef0
Merge "Properly expect all callbacks in testStackedLinkProperties." am: 4129d435c1
...
am: 6d8a63cf80
Change-Id: I9b066e4242d52f917e36a05911bdcd843c3f5c84
2019-01-21 22:50:47 -08:00
Lorenzo Colitti
6d8a63cf80
Merge "Properly expect all callbacks in testStackedLinkProperties."
...
am: 4129d435c1
Change-Id: Ida7b6da29e46856b504cc5b58afa78404a54cb4e
2019-01-21 22:41:16 -08:00
Lorenzo Colitti
4129d435c1
Merge "Properly expect all callbacks in testStackedLinkProperties."
2019-01-22 06:31:23 +00:00
Remi NGUYEN VAN
7e09d1403e
[automerger skipped] Merge "Add NetworkMonitor constants to SystemApi" am: 591de4579d am: b78f2a5d68
...
am: c90d59e401 -s ours
am skip reason: change_id I8b5f0bb61c3ef0d2f33af7dd67b72ac6c5a1d1b5 with SHA1 c0e07e58ff is in history
Change-Id: I2b7a39367fbd27612258adc3bf0e093e4b7fdd99
2019-01-21 19:34:29 -08:00
Remi NGUYEN VAN
c90d59e401
Merge "Add NetworkMonitor constants to SystemApi" am: 591de4579d
...
am: b78f2a5d68
Change-Id: I0281ff981cbd5d26a2f2874db23244bebad9c66b
2019-01-21 19:25:05 -08:00
Remi NGUYEN VAN
b78f2a5d68
Merge "Add NetworkMonitor constants to SystemApi"
...
am: 591de4579d
Change-Id: Ic9591f31c6f2b7e613a78fa32311412952be26b8
2019-01-21 19:15:59 -08:00
Remi NGUYEN VAN
591de4579d
Merge "Add NetworkMonitor constants to SystemApi"
2019-01-22 03:03:37 +00:00
Lorenzo Colitti
46eae8a765
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
ea76c43d5a
Merge "Add NetworkMonitor constants to SystemApi"
2019-01-22 01:46:12 +00:00
Remi NGUYEN VAN
f76eb47fe3
Merge "Add fields used by NetworkStack to the API" am: ca2d2c268b am: 81bbdbb10f
...
am: 22ce4c1af7
Change-Id: I865a0298a17582c1c2d1f1eeb086979f8955ac33
2019-01-21 15:57:53 -08:00
Remi NGUYEN VAN
22ce4c1af7
Merge "Add fields used by NetworkStack to the API" am: ca2d2c268b
...
am: 81bbdbb10f
Change-Id: I5b7cce21b8692184f9d6121f0641bc2318370671
2019-01-21 15:47:28 -08:00
Remi NGUYEN VAN
81bbdbb10f
Merge "Add fields used by NetworkStack to the API"
...
am: ca2d2c268b
Change-Id: Iaf2dfea8263a1c7e78130222126e2ebbaa84fedd
2019-01-21 15:36:17 -08:00
Remi NGUYEN VAN
737c49d78e
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
ca2d2c268b
Merge "Add fields used by NetworkStack to the API"
2019-01-21 23:20:26 +00:00
Chalard Jean
467d8f991e
Merge changes I2ddfef0c,I49bee0c9 am: ba4d5be35a am: 11c58491ff
...
am: c8a38238fe
Change-Id: I369bf5d92a3f70e789043d33bcbc85099aebbb69
2019-01-21 11:28:55 -08:00
Remi NGUYEN VAN
6be4e67962
Merge "Add stable AIDL parcelables for IIpClient API" am: df5f539427 am: 2ec1342261
...
am: 10b0b4e128
Change-Id: Ieac619f043a7142cbbec3eaec334b7fac97ce7fc
2019-01-21 11:19:54 -08:00
Chalard Jean
c8a38238fe
Merge changes I2ddfef0c,I49bee0c9 am: ba4d5be35a
...
am: 11c58491ff
Change-Id: I552730badc910df5f5a48c2ded6566071b604783
2019-01-21 11:18:35 -08:00
Remi NGUYEN VAN
10b0b4e128
Merge "Add stable AIDL parcelables for IIpClient API" am: df5f539427
...
am: 2ec1342261
Change-Id: Ifae5ae9e6e396452ce4c432d8aa613d03ba59824
2019-01-21 11:09:28 -08:00
Chalard Jean
11c58491ff
Merge changes I2ddfef0c,I49bee0c9
...
am: ba4d5be35a
Change-Id: I54b43a6fe240d00d0e530a8777bdb9f452a2b539
2019-01-21 11:01:47 -08:00
Remi NGUYEN VAN
2ec1342261
Merge "Add stable AIDL parcelables for IIpClient API"
...
am: df5f539427
Change-Id: Id3e39ed932161941f953c2f38d1ce9ed0afcc785
2019-01-21 10:56:19 -08:00
Remi NGUYEN VAN
5af2e292e1
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
23d6570821
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
e541d1811b
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
c0e07e58ff
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
259f626583
Merge "Remove dead KeepaliveInfo if it cannot be started" am: 6360a83b6c am: ba5be38fac
...
am: 24e6f543f5
Change-Id: Ib257dd212b57464ac1aeb372798805798ea161cd
2019-01-21 03:05:16 -08:00
Junyu Lai
24e6f543f5
Merge "Remove dead KeepaliveInfo if it cannot be started" am: 6360a83b6c
...
am: ba5be38fac
Change-Id: I61f441237fcaadc5abc5592e7a63e4d35282def5
2019-01-21 02:52:21 -08:00
Chalard Jean
ba4d5be35a
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
df5f539427
Merge "Add stable AIDL parcelables for IIpClient API"
2019-01-21 08:01:26 +00:00
Chalard Jean
d92c3d5c95
[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
ba5be38fac
Merge "Remove dead KeepaliveInfo if it cannot be started"
...
am: 6360a83b6c
Change-Id: I7ec41627065d21d025370905257483738ee04c42
2019-01-20 20:09:51 -08:00
Remi NGUYEN VAN
297c2d6086
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
6360a83b6c
Merge "Remove dead KeepaliveInfo if it cannot be started"
2019-01-21 03:48:15 +00:00
Josh Gao
a70dcfb253
Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." am: 79a632905b am: 49ccab2d41
...
am: 97e14189cd
Change-Id: I34e6480f42957da27aeb6f8ccc6bd91d2304e590
2019-01-18 15:57:06 -08:00
Josh Gao
97e14189cd
Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." am: 79a632905b
...
am: 49ccab2d41
Change-Id: I928a47f677cc882ee816b6fa8afb41ead2729466
2019-01-18 15:27:33 -08:00
Josh Gao
49ccab2d41
Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets."
...
am: 79a632905b
Change-Id: Ib8c818a3038877b87187659b0ff65a9d31b998e7
2019-01-18 14:55:47 -08:00