Commit Graph

5581 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
8071bbdd32 Merge "Migrate ICaptivePortal to stable AIDL" am: eb7c53718a
am: 03ee99b190

Change-Id: I6fa53f6f7c45aa801a1e48e04bdb3ca6004f565d
2019-01-22 14:35:29 -08:00
Remi NGUYEN VAN
03ee99b190 Merge "Migrate ICaptivePortal to stable AIDL"
am: eb7c53718a

Change-Id: Id0844ec4d438dcc1f6c1028552dd21da6bd76584
2019-01-22 14:25:09 -08:00
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
Pavel Grafov
8bfc3feb3f Merge "Add API for VPN apps to query always-on and lockdown." am: 5e135e2bdc
am: d332a50c1f

Change-Id: I48f3441f06af2a69776eacc5ee52463873739bdb
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

Change-Id: Icb11cdd5c7384eacf1df9b7a0c42e451641f0e04
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
8e3c713db0 Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b
am: d16b91fddd

Change-Id: Ic15474fe0b7da8062114367ec4f692e30e73d549
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
Remi NGUYEN VAN
330a49d63c Merge "Add NetworkStack metrics to system API" am: bda2c4fe17
am: 65599b3ca1

Change-Id: I8d711dcf76935d28d8a610d6a18da77cea77268e
2019-01-22 00:18:58 -08:00
Remi NGUYEN VAN
65599b3ca1 Merge "Add NetworkStack metrics to system API"
am: bda2c4fe17

Change-Id: I686e0ffb8d226d9245f1ef6c04bbc8d586c61e81
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
63b0c7c37f Merge "Properly expect all callbacks in testStackedLinkProperties." am: 98dda351ac
am: 2244ef14a8

Change-Id: I9b066e4242d52f917e36a05911bdcd843c3f5c84
2019-01-21 22:50:47 -08:00
Lorenzo Colitti
2244ef14a8 Merge "Properly expect all callbacks in testStackedLinkProperties."
am: 98dda351ac

Change-Id: Ida7b6da29e46856b504cc5b58afa78404a54cb4e
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
54fb67a42e Merge "Add NetworkMonitor constants to SystemApi" am: a1e4e0bc23
am: 50cf5400b6

Change-Id: I0281ff981cbd5d26a2f2874db23244bebad9c66b
2019-01-21 19:25:05 -08:00
Remi NGUYEN VAN
50cf5400b6 Merge "Add NetworkMonitor constants to SystemApi"
am: a1e4e0bc23

Change-Id: Ic9591f31c6f2b7e613a78fa32311412952be26b8
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
b1f5762741 Merge "Add fields used by NetworkStack to the API" am: aa983b7f1c
am: cbd795dff7

Change-Id: I5b7cce21b8692184f9d6121f0641bc2318370671
2019-01-21 15:47:28 -08:00
Remi NGUYEN VAN
cbd795dff7 Merge "Add fields used by NetworkStack to the API"
am: aa983b7f1c

Change-Id: Iaf2dfea8263a1c7e78130222126e2ebbaa84fedd
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
16e7e25468 Merge changes I2ddfef0c,I49bee0c9 am: 1feafc2e2a
am: ae62bfc346

Change-Id: I552730badc910df5f5a48c2ded6566071b604783
2019-01-21 11:18:35 -08:00
Remi NGUYEN VAN
8aa71627c2 Merge "Add stable AIDL parcelables for IIpClient API" am: 2fd1c3864e
am: cfa31032d6

Change-Id: Ifae5ae9e6e396452ce4c432d8aa613d03ba59824
2019-01-21 11:09:28 -08:00
Chalard Jean
ae62bfc346 Merge changes I2ddfef0c,I49bee0c9
am: 1feafc2e2a

Change-Id: I54b43a6fe240d00d0e530a8777bdb9f452a2b539
2019-01-21 11:01:47 -08:00
Remi NGUYEN VAN
cfa31032d6 Merge "Add stable AIDL parcelables for IIpClient API"
am: 2fd1c3864e

Change-Id: Id3e39ed932161941f953c2f38d1ce9ed0afcc785
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
Junyu Lai
811b614c5a Merge "Remove dead KeepaliveInfo if it cannot be started" am: 8e1e64f928
am: e2c006f40b

Change-Id: I61f441237fcaadc5abc5592e7a63e4d35282def5
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

Change-Id: I7ec41627065d21d025370905257483738ee04c42
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
5363d5be5d Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." am: 5ceb563f51
am: 39ac4fe5bf

Change-Id: I928a47f677cc882ee816b6fa8afb41ead2729466
2019-01-18 15:27:33 -08:00
Josh Gao
39ac4fe5bf Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets."
am: 5ceb563f51

Change-Id: Ib8c818a3038877b87187659b0ff65a9d31b998e7
2019-01-18 14:55:47 -08:00
Josh Gao
5ceb563f51 Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." 2019-01-18 22:25:35 +00:00
junyulai
8c925d2762 Remove dead KeepaliveInfo if it cannot be started
If KeepaliveInfo was created but cannot be started, current
design will only notify apps but not remove it from local
hashmap, which will cause unexpected behavior if someone
tries to iterate records and fire callbacks.

Bug: 122636283
Test: atest FrameworksNetTests
Change-Id: If4cb25a881dd3555f569c729f88741675f7f3bdf
2019-01-18 21:48:13 +08:00
Etan Cohen
988ab75073 Merge "[CS] Add an option to block sensitive network specifier" am: 895ef965f5
am: d1ee1a649f

Change-Id: I64f17aebbfe1820b42aa33b487b17e65ba734ab3
2019-01-17 21:24:03 -08:00
Etan Cohen
d1ee1a649f Merge "[CS] Add an option to block sensitive network specifier"
am: 895ef965f5

Change-Id: Idedbc2ec564bd1ab65a3bb466ea4f20bb849648f
2019-01-17 21:14:54 -08:00
Etan Cohen
107ae95001 [CS] Add an option to block sensitive network specifier
Network specifiers are used for 2 purposes:

- As part of network requests to specify more information on the type
  of requested networks.
- On network agents to specify information about their networks.

The network specifiers of the requests and agents are matched to each
other. However, the agent network specifier may contain sensitive
information which we do not want forwarded to any app.

This CL adds an option to strip out this agent network specifier before
the network capabilities are forwarded to the app.

Bug: 122160111
Test: atest ConnectivityServiceTest (frameworks/base/tests/net)
Test: atest frameworks/base/tests/net
Test: atest frameworks/opt/net/wifi/tests/wifitests
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks/opt/net/ethernet/tests
Test: atest android.net.cts - some flakiness!
Test: act.py ThroughputTest
Test: act.py DataPathTest
Test: atest SingleDeviceTest (cts)
Change-Id: If08d312ff814bdde1147518f923199e6349503d5
2019-01-17 16:30:05 -08:00
Lorenzo Colitti
9d98567b3c Merge changes Iec53a9fd,Iac4cfe70 am: 8621e44c39
am: 4a4e693e3e

Change-Id: I56af4e9a82f66e507d2360822af27a39e0fcb238
2019-01-16 01:51:38 -08:00
Lorenzo Colitti
4a4e693e3e Merge changes Iec53a9fd,Iac4cfe70
am: 8621e44c39

Change-Id: I8fae2c4d23d6e904b473b1e906094f997c8e446c
2019-01-16 01:42:42 -08:00
Lorenzo Colitti
8621e44c39 Merge changes Iec53a9fd,Iac4cfe70
* changes:
  Test parceling empty LinkProperties.
  Delete the clatd functions from NetworkManagementService.
2019-01-16 09:28:06 +00:00
Remi NGUYEN VAN
1bd476265c Merge "Add Nat64Prefix to LinkProperties copy constructor" am: 786215116c
am: bd228f1a83

Change-Id: I793230bd65e24c5976849e860defa159cf22507b
2019-01-16 00:57:04 -08:00
Remi NGUYEN VAN
bd228f1a83 Merge "Add Nat64Prefix to LinkProperties copy constructor"
am: 786215116c

Change-Id: If0b47f74b9ac1016ab7e72574745e12e525e2555
2019-01-16 00:47:45 -08:00
Remi NGUYEN VAN
786215116c Merge "Add Nat64Prefix to LinkProperties copy constructor" 2019-01-16 08:35:01 +00:00