Commit graph

4,572 commits

Message SHA1
Relocate KeepalivePacketData to frameworks/base
Due to an issue resolving the boot classpath, the
KeepalivePacketData structure cannot be referenced
by frameworks/opt/telephony while it is in services.

-Move KeepalivePacketData to android.net
-Also, relocate IpUtils without changing the package
 name.

Bug: 38350389
Test: compilation
Change-Id: If5fc63e9ad8b9b2d4c2fee47ff4bab2ab190a05a
(cherry picked from commit bd4093be7cab51d6ad031854324134a9c8637c2c)

Nathan Harold   commited 2018-01-24 10:26:04 -08:00
f8a2bc3eee
Merge "Add TunnelInterface API and KernelResourceRecords" am: 7a7d04e103 am: 7cacbb3c86
am: 54cd11245e

Change-Id: I955d5090171f08e4fa20eac5bdfe761132b87d35

Benedict Wong   authored and   android-build-merger   commited 2018-01-24 09:54:06 +00:00
9e2e358045
Merge "Add xfrm mark in IpSecConfig" am: da7f993d34 am: 6829dd8442
am: f717d668cf

Change-Id: Ibaee9700cc6befdf6bbdb792cb673611e571d19a

Benedict Wong   authored and   android-build-merger   commited 2018-01-24 09:48:25 +00:00
379c600c4c
Merge "Add TunnelInterface API and KernelResourceRecords" am: 7a7d04e103
am: 7cacbb3c86

Change-Id: If27d78708ce225a900ad78a82d9f323770223808

Benedict Wong   authored and   android-build-merger   commited 2018-01-24 09:02:56 +00:00
54cd11245e
Merge "Add TunnelInterface API and KernelResourceRecords"
am: 7a7d04e103

Change-Id: Ic8a93b2d6d8280c01808968251e6f422fa1d2340

Benedict Wong   authored and   android-build-merger   commited 2018-01-24 08:55:38 +00:00
7cacbb3c86
Merge "Add xfrm mark in IpSecConfig" am: da7f993d34
am: 6829dd8442

Change-Id: I03ddca0611c4e0b41edc705cdb39b415205bb14b

Benedict Wong   authored and   android-build-merger   commited 2018-01-24 08:19:16 +00:00
f717d668cf
Merge "Add xfrm mark in IpSecConfig"
am: da7f993d34

Change-Id: Idcac0878b4f74c25ef007fb7f1643fca5de80225

Benedict Wong   authored and   android-build-merger   commited 2018-01-24 08:00:52 +00:00
6829dd8442
Merge "Add TunnelInterface API and KernelResourceRecords"
Benedict Wong   authored and   Gerrit Code Review   commited 2018-01-24 07:25:04 +00:00
7a7d04e103
Add TunnelInterface API and KernelResourceRecords
This change adds one KernelResourceRecord type (TunnelInterfaceRecord),
and adds methods for the creation of TunnelInterfaces, as well as the
application of Transforms to the given TunnelInterfaces

As part of the generation of ikeys/okeys, a ReserveKeyTracker manages a
java bitset to avoid collisions and reserve/release keys.

Bug: 63588681
Test: Compiles, CTS, unit tests all pass on AOSP_marlin
Change-Id: I9e9b6455e27073acd4491eae666aa966b3b10e0f

Benedict Wong   commited 2018-01-24 07:24:27 +00:00
145b425fac
Resolve merge conflicts of d15f09adf7 to master
Test: this is the exact code these changes were meant to give
      without conflict had the auto-merger not squashed them
      together before it tried to merge them. It was tested on
      master in this state.

Change-Id: I5cbde17fb6016e5e6b5d0b04c8f41858d708ef4a

Chalard Jean   commited 2018-01-24 15:59:26 +09:00
5589119697
Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ... am: 515b2e9434
am: ee75f435b9

Change-Id: I3f2185330789a8b02cc5e05912e3f17256ba1b86

Chalard Jean   authored and   android-build-merger   commited 2018-01-24 06:11:06 +00:00
d15f09adf7
Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...
am: 515b2e9434

Change-Id: I49269ac65138be59d68561ea1c15ff2ad0339d8b

Chalard Jean   authored and   android-build-merger   commited 2018-01-24 06:03:41 +00:00
ee75f435b9
Merge "Add xfrm mark in IpSecConfig"
Benedict Wong   authored and   Gerrit Code Review   commited 2018-01-24 05:53:29 +00:00
da7f993d34
Merge changes from topic "bpfStats" am: e339107631 am: a0b44c329f
am: a79ac6a66b

Change-Id: I672efa1221e17d0962ca5702330fc83d75fcac81

Chenbo Feng   authored and   android-build-merger   commited 2018-01-24 05:46:52 +00:00
ef57c37338
Merge changes from topic "bpfStats" am: e339107631
am: a0b44c329f

Change-Id: Ib4790159fd331858ce9f3343a44ccec66fae638c

Chenbo Feng   authored and   android-build-merger   commited 2018-01-24 05:39:54 +00:00
a79ac6a66b
Merge changes from topic "bpfStats"
am: e339107631

Change-Id: I488be110cca66990f44f6e45d5489ce23f36432e

Chenbo Feng   authored and   android-build-merger   commited 2018-01-24 05:32:34 +00:00
a0b44c329f
Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...
* changes:
  Let network requests see VPNs.
  Move constants into a new file.
  Make sure listen requests from VPN apps see their own networks
  Add a test for new UID checking code.
  Remove UID_RANGES_ADDED and REMOVED.
  Move VPN allowed UIDs into NetworkCapabilities.
  Pre-import to remove a conflict.

Chalard Jean   authored and   Gerrit Code Review   commited 2018-01-24 04:09:44 +00:00
515b2e9434
Merge changes from topic "bpfStats"
* changes:
  Use /proc/net/dev to get stats summary
  Add bpf support for NetworkStatsFactory
  Add BPF support for NetworkStatsService

Treehugger Robot   authored and   Gerrit Code Review   commited 2018-01-24 04:08:29 +00:00
e339107631
Merge "Add checks to ensure SPIs are not reused" am: e9f609ee76 am: 567ecd6790
am: 7c66896fa8

Change-Id: I13738ac37710ec7934998ef269681ae7c41c612e

Benedict Wong   authored and   android-build-merger   commited 2018-01-23 20:40:39 +00:00
c3153bd028
Merge changes from topic "multipath-datausage-backport" am: ae0d925470 am: 50f296dec7
am: fb1afacbf1  -s ours

Change-Id: Ib16c50de2a3846dae9736e7ca68a4282831f0812

Lorenzo Colitti   authored and   android-build-merger   commited 2018-01-23 20:20:53 +00:00
1e7d634a10
Disable IpConnectivityMetricsTest. am: c4ba57cadd am: 71472bea68
am: b74b04b1b3  -s ours

Change-Id: Ie9b63bf66eee676568e7262350033dbb286c04c4

Lorenzo Colitti   authored and   android-build-merger   commited 2018-01-23 20:10:13 +00:00
f989f097f7
Merge "Add checks to ensure SPIs are not reused" am: e9f609ee76
am: 567ecd6790

Change-Id: I8c7243bc600e5f2e9abec03b5a357ed6376aa9bf

Benedict Wong   authored and   android-build-merger   commited 2018-01-23 19:55:47 +00:00
7c66896fa8
Merge changes from topic "multipath-datausage-backport" am: ae0d925470
am: 50f296dec7

Change-Id: I45f0c69e3440e9ec69c82e81c41bea682a359389

Lorenzo Colitti   authored and   android-build-merger   commited 2018-01-23 19:43:13 +00:00
fb1afacbf1
Disable IpConnectivityMetricsTest. am: c4ba57cadd
am: 71472bea68

Change-Id: Ic5a24e40ce126bc872281bb353706a245eb345f2

Lorenzo Colitti   authored and   android-build-merger   commited 2018-01-23 19:33:27 +00:00
b74b04b1b3
Merge "Add checks to ensure SPIs are not reused"
am: e9f609ee76

Change-Id: I893925014557e5ae13303debc4ee8f50faf9605d

Benedict Wong   authored and   android-build-merger   commited 2018-01-23 19:27:51 +00:00
567ecd6790
Merge changes from topic "multipath-datausage-backport"
am: ae0d925470

Change-Id: Ic29d71ade161434b6dea796a887f60b5587ca1d5

Lorenzo Colitti   authored and   android-build-merger   commited 2018-01-23 19:17:54 +00:00
50f296dec7
Disable IpConnectivityMetricsTest.
am: c4ba57cadd

Change-Id: Iba9dad4001c6aa725285eee6df32f116c846532d

Lorenzo Colitti   authored and   android-build-merger   commited 2018-01-23 19:04:05 +00:00
71472bea68
Merge "Add checks to ensure SPIs are not reused"
Benedict Wong   authored and   Gerrit Code Review   commited 2018-01-23 18:00:06 +00:00
e9f609ee76
Merge changes from topic "multipath-datausage-backport"
* changes:
  Support passing a template to NetworkStatsManager queries.
  Add metered, roaming, and defaultNetwork info to NetworkTemplate.
  Unbreak frameworks-net tests broken by missing libutilscallstack.
  Disable IpConnectivityMetricsTest.
  Add the defaultNetwork element to the netstats.proto.
  Add getDefaultNetwork to the NetworkStats public API.

Lorenzo Colitti   authored and   Gerrit Code Review   commited 2018-01-23 15:22:18 +00:00
ae0d925470
Merge "Add ConnectivityManager.getNetworkWatchlistConfigHash()"
Ricky Wai   authored and   Android (Google) Code Review   commited 2018-01-23 14:25:39 +00:00
5f094094d9
Let network requests see VPNs.
Test: runtest frameworks-net
Test: also tested with VPN app
Test: also cts passing
Change-Id: I3b16caad7787c3c1f2921ca1583815c89efbadc5

Chalard Jean   commited 2018-01-23 21:38:00 +09:00
fd3a4ae0fe
Move constants into a new file.
Also audit all constants, make some private, annotate some
with @VisibleForTesting.

Test: runtest framework && cts
Change-Id: Iaf5ea7abd36fd8d544dcc84654f6cb529196d654

Chalard Jean   commited 2018-01-23 21:38:00 +09:00
3a6b34c989
Make sure listen requests from VPN apps see their own networks
Test: runtest frameworks-net
Test: CTS pass, including with the next patch which is what this
      actually matters for

Change-Id: I09a94042acbefa24ab884f95326e30d6ab280b82

Chalard Jean   commited 2018-01-23 21:38:00 +09:00
b399bf16d1
Add a test for new UID checking code.
Test: manual, this is a new test and it passes
Change-Id: I69a39039647ec05f970700e36c5f1e1e6e110f4a

Chalard Jean   commited 2018-01-23 21:38:00 +09:00
92a116d264
Remove UID_RANGES_ADDED and REMOVED.
Test: runtest frameworks-net
Test: also tested with VPN app
Test: also cts passing
Change-Id: I3530030996daeba05a8f2fffc5c6e21ed62e3f40

Chalard Jean   commited 2018-01-23 21:38:00 +09:00
b2a4991781
Move VPN allowed UIDs into NetworkCapabilities.
Test: runtest frameworks-net
Test: also new specific tests for this new code
Test: also tested with VPN app
Test: also cts passing
Change-Id: If0311bae2bf99dedac959febadecf4f92f3064b8

Chalard Jean   commited 2018-01-23 21:38:00 +09:00
753d9734d2
Pre-import to remove a conflict.
Test: compiles and passes checkstyle
Change-Id: I1ffdd88e6268fee0cf88992420ab21eb42928957

Chalard Jean   commited 2018-01-23 21:38:00 +09:00
cbe99b35a0
Disable IpConnectivityMetricsTest.
This test has been failing for a while, and we are do not have
bandwidth to fix it during the next week.

Test: make -j64 FrameworksNetTests RUN_ERROR_PRONE=true
Test: atest FrameworksNetTests:IpConnectivityMetricsTest
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
Change-Id: I59d73c1773e160a726996f3ab4ad20312decc127
Merged-In: I59d73c1773e160a726996f3ab4ad20312decc127

Lorenzo Colitti   commited 2018-01-23 18:38:48 +09:00
c4ba57cadd
Use /proc/net/dev to get stats summary
If the qtaguid proc file is no longer exist, the device is running new
eBPF module to do traffic accounting. So the NetworkStatsFactory need to
use the proc/net/dev interface to get the per interface traffic stats
summary. Also, adding a test to verify the helper function work properly

Bug: 30950746
Test: run NetworkStatsFactoryTest
Change-Id: Ia36808bf02f1637dd41a3e7c50917b91b1a77524

Chenbo Feng   commited 2018-01-23 00:35:02 -08:00
b25ada3657
Add bpf support for NetworkStatsFactory
Add the native method used to read the detail information of network
stats from bpf maps. The native method of NetworkStatsFactory should
choose the correct implementation to get the stats detail depending on
the kernel version. Currently the bpf result is printed as a reference
and the actual behavior of NetworkStatsFactory should not change.

Test: NetworkStatsFactory related cts test should not fail.
Bug: 30950746
Change-Id: I4715a23559b5b2306bd556cea0431f0ed172a993

Chenbo Feng   commited 2018-01-23 00:34:53 -08:00
7224ab835a
Add ConnectivityManager.getNetworkWatchlistConfigHash()
Apps can use this API to get network watchlist config hash for auditing.

Bug: 63908748
Test: Able to compile
Change-Id: I5ce9e6bb6dad88139c0a102da58be0dd7c284b7a

Ricky Wai   commited 2018-01-23 06:32:36 +00:00
7097cc9319
Add checks to ensure SPIs are not reused
This change adds an additional check in CheckIpsecConfig to prevent
users from using the same SPI twice. This allows for a more granular
error message.

Bug: 70642141
Test: Tests added in IpSecServiceParameterizedTest
Change-Id: I9621fb05c6b162bd8ae8db4ac1e64feaa9d0ac73

Benedict Wong   commited 2018-01-22 21:09:47 -08:00
bb31e20bcd
Merge "Address comments and final cleanup from refcounting integration" am: 3dcee3120b am: 9b1dfec3de
am: 36efbd03c2

Change-Id: I0612286b8d95b0ae10c1337214f9c3b4e570fbac

Benedict Wong   authored and   android-build-merger   commited 2018-01-23 00:19:05 +00:00
22087fd1c3
Merge "Address comments and final cleanup from refcounting integration" am: 3dcee3120b
am: 9b1dfec3de

Change-Id: I7ed4a6bb90f3cf3ed5fd0e6ad20b033e588a4c90

Benedict Wong   authored and   android-build-merger   commited 2018-01-23 00:08:17 +00:00
36efbd03c2
Merge "Address comments and final cleanup from refcounting integration"
am: 3dcee3120b

Change-Id: Ie0bc2b81e09ee874ef848905bb486967a857c6d1

Benedict Wong   authored and   android-build-merger   commited 2018-01-22 23:57:28 +00:00
9b1dfec3de
Merge "Address comments and final cleanup from refcounting integration"
Benedict Wong   authored and   Gerrit Code Review   commited 2018-01-22 20:32:18 +00:00
3dcee3120b
Merge "Rename create/delete transform methods" am: 77883ceedc am: 2af9354354
am: 2ec160eb05

Change-Id: Ie07b0b608b3dfcbfc4228a15e26fe6f6559315f9

Benedict Wong   authored and   android-build-merger   commited 2018-01-22 20:03:48 +00:00
c3d749e0a5
Merge "Rename create/delete transform methods" am: 77883ceedc
am: 2af9354354

Change-Id: I16bfb511ac2d6094e246f79d51fe4520d3e765cd

Benedict Wong   authored and   android-build-merger   commited 2018-01-22 19:53:15 +00:00
2ec160eb05
Merge "Rename create/delete transform methods"
am: 77883ceedc

Change-Id: I76576d1f3193fcbb3680fb29893cf696ea7a41fe

Benedict Wong   authored and   android-build-merger   commited 2018-01-22 19:44:43 +00:00
2af9354354
Merge "Rename create/delete transform methods"
Benedict Wong   authored and   Gerrit Code Review   commited 2018-01-22 17:57:15 +00:00
77883ceedc