Commit Graph

3890 Commits

Author SHA1 Message Date
Lorenzo Colitti
c2888cbc48 Merge "Migrate ICaptivePortal to stable AIDL" 2019-01-22 15:38:07 +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
b809148b9a Merge changes Ieef54d84,Ica3e88c2 am: 491f53523a am: 8e4ce11318
am: c904972acd

Change-Id: Idcc18b95951c566335431a493ed7b9d49477a4c0
2019-01-22 05:32:01 -08:00
Remi NGUYEN VAN
c904972acd Merge changes Ieef54d84,Ica3e88c2 am: 491f53523a
am: 8e4ce11318

Change-Id: I33fc6ee4cf47676dc2a4a9369dd3fc053dba34ec
2019-01-22 05:22:30 -08:00
Remi NGUYEN VAN
1f7632422d Merge "Add SystemApi utility for raw sockets." am: 91c81c13b6 am: 510d2f82ad
am: 4593e07944

Change-Id: I84effb70b0bbea0e57d5982105fc304080e504ac
2019-01-22 05:11:38 -08:00
Remi NGUYEN VAN
4593e07944 Merge "Add SystemApi utility for raw sockets." am: 91c81c13b6
am: 510d2f82ad

Change-Id: I2252fbfb4a793b33193037003823af68a56ae760
2019-01-22 05:02:22 -08:00
Remi NGUYEN VAN
491f53523a Merge changes Ieef54d84,Ica3e88c2
* changes:
  Remove NetworkStack dependencies on hidden members
  Expose ServiceSpecificException as @SystemApi.
2019-01-22 13:00:10 +00:00
Remi NGUYEN VAN
91c81c13b6 Merge "Add SystemApi utility for raw sockets." 2019-01-22 12:38:33 +00:00
Remi NGUYEN VAN
111e1c35e3 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
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
c1c02dcb65 Remove NetworkStack dependencies on hidden members
- DhcpClient only shares its handler with IpClient, and NetworkMonitor
   has its own handler: remove Protocol.BASE_DHCP,
   Protocol.BASE_NETWORK_MONITOR
 - Remove dependency on Network.netid in NetworkMonitor
 - Remove dependency on Sets.newArraySet in DhcpServingParams
 - Remove dependency on formatDuration() in DhcpClient
 - Replace isMetered() with hasCapability() in NetworkMonitor
 - Use WifiManager.isScanAlwaysAvailable instead of reading setting

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: Ieef54d847ddc081fb33cbad0b050b06d2e52548e
2019-01-22 18:48:12 +09:00
Remi NGUYEN VAN
811f6385be Add SystemApi utility for raw sockets.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: Id228bf3317b6933314174571697ee256b2f18452
2019-01-22 17:50:33 +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
d0436c7114 Merge "Add NetworkMonitor constants to SystemApi" am: c3a6317b0b
am: 95b523ce8a

Change-Id: I0281ff981cbd5d26a2f2874db23244bebad9c66b
2019-01-21 19:25:05 -08:00
Remi NGUYEN VAN
c3a6317b0b Merge "Add NetworkMonitor constants to SystemApi" 2019-01-22 03:03:37 +00:00
Remi NGUYEN VAN
b0d60c4cf8 Merge "Add NetworkMonitor constants to SystemApi" 2019-01-22 01:46:12 +00: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
ce476415ac Merge changes I5a6174a4,Idfbfdf54 am: 33a04d0ff9 am: 8898e7c094
am: 6134d99bce

Change-Id: I5e5c3d34e2eb672cb53b374609cbe6ca6ca9b98d
2019-01-21 16:11:12 -08:00
Remi NGUYEN VAN
6c5b1ff4ad Merge "Add fields used by NetworkStack to the API" am: 79a6d5e30c am: 4bf93bb9c4
am: c4c5079a09

Change-Id: I865a0298a17582c1c2d1f1eeb086979f8955ac33
2019-01-21 15:57:53 -08:00
Remi NGUYEN VAN
6134d99bce Merge changes I5a6174a4,Idfbfdf54 am: 33a04d0ff9
am: 8898e7c094

Change-Id: Ibbbf2445fa4094733227f4ece643160fb7ca7c46
2019-01-21 15:56:22 -08:00
Remi NGUYEN VAN
c4c5079a09 Merge "Add fields used by NetworkStack to the API" am: 79a6d5e30c
am: 4bf93bb9c4

Change-Id: I5b7cce21b8692184f9d6121f0641bc2318370671
2019-01-21 15:47:28 -08:00
Remi NGUYEN VAN
33a04d0ff9 Merge changes I5a6174a4,Idfbfdf54
* changes:
  Acquire lock to write NetworkStackConnector
  Allow Bluetooth to bind to NetworkStack
2019-01-21 23:31:07 +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
Remi NGUYEN VAN
79a6d5e30c Merge "Add fields used by NetworkStack to the API" 2019-01-21 23:20:26 +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
Remi NGUYEN VAN
800e843862 Acquire lock to write NetworkStackConnector
As Java reference writes are atomic, the previous code should not have
issues, but since mConnector is marked @GuardedBy it could trigger
static analysis.

Test: m
Change-Id: I5a6174a4f32c349e593d0a16d58293d608a487c7
2019-01-21 23:21:40 +09:00
Remi NGUYEN VAN
31f1d0cd8d 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
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
Remi NGUYEN VAN
7731c5bae2 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
d0a933476c 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
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
Remi NGUYEN VAN
69b967f5d0 Allow Bluetooth to bind to NetworkStack
Test: flashed, verified bluetooth tethering gets IP address
Bug: b/112869080
Change-Id: Idfbfdf54754fea46eb0099b9b9a3bdc29dd241e0
2019-01-21 18:25:01 +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
Etan Cohen
8945e2e33c Merge "[CS] Add an option to block sensitive network specifier" am: 895ef965f5 am: 787525e951
am: 82083c8a15

Change-Id: I17fba0e9c0314b32597ccdc1ac6de61ca796e9b8
2019-01-17 21:33:27 -08:00
Etan Cohen
82083c8a15 Merge "[CS] Add an option to block sensitive network specifier" am: 895ef965f5
am: 787525e951

Change-Id: I64f17aebbfe1820b42aa33b487b17e65ba734ab3
2019-01-17 21:24:03 -08:00
Etan Cohen
836ad571eb [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
Remi NGUYEN VAN
e9ffc74145 Merge "Add stable AIDL parcelables for LinkProperties" am: c37177a7d6 am: e45592f5fd
am: 15f85cd5f2

Change-Id: I81b1d0405d144dc8b053c6f3961a5542de4dd0ec
2019-01-17 01:06:47 -08:00