Josh Gao
5363d5be5d
Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets." am: 5ceb563f51
...
am: 39ac4fe5bf
2019-01-18 15:27:33 -08:00
Josh Gao
39ac4fe5bf
Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets."
...
am: 5ceb563f51
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
cc407b9759
Merge "[CS] Add an option to block sensitive network specifier" am: 895ef965f5 am: d1ee1a649f
...
am: 988ab75073
2019-01-17 21:33:27 -08:00
Etan Cohen
988ab75073
Merge "[CS] Add an option to block sensitive network specifier" am: 895ef965f5
...
am: d1ee1a649f
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
2b889d5ddf
Merge changes Iec53a9fd,Iac4cfe70 am: 8621e44c39 am: 4a4e693e3e
...
am: 9d98567b3c
2019-01-16 02:03:06 -08:00
Lorenzo Colitti
9d98567b3c
Merge changes Iec53a9fd,Iac4cfe70 am: 8621e44c39
...
am: 4a4e693e3e
2019-01-16 01:51:38 -08:00
Lorenzo Colitti
4a4e693e3e
Merge changes Iec53a9fd,Iac4cfe70
...
am: 8621e44c39
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
55e89b1e81
Merge "Add Nat64Prefix to LinkProperties copy constructor" am: 786215116c am: bd228f1a83
...
am: 1bd476265c
2019-01-16 01:06:17 -08:00
Remi NGUYEN VAN
1bd476265c
Merge "Add Nat64Prefix to LinkProperties copy constructor" am: 786215116c
...
am: bd228f1a83
2019-01-16 00:57:04 -08:00
Remi NGUYEN VAN
bd228f1a83
Merge "Add Nat64Prefix to LinkProperties copy constructor"
...
am: 786215116c
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
Remi NGUYEN VAN
8f7bc647b5
Add Nat64Prefix to LinkProperties copy constructor
...
The attribute is copied when parceling/unparceling so should also be
preserved in the copy constructor.
Test: tests based on this pass
Change-Id: Ia48d94fc075e6414f537dad181a236be5a32b41b
2019-01-16 15:27:27 +09:00
Lorenzo Colitti
0354d07f69
Merge "Add the NAT64 prefix to LinkProperties." am: 983e77db4a am: 6b39032761
...
am: 9281e5c55f
2019-01-14 20:40:25 -08:00
Lorenzo Colitti
9281e5c55f
Merge "Add the NAT64 prefix to LinkProperties." am: 983e77db4a
...
am: 6b39032761
2019-01-14 20:29:10 -08:00
Lorenzo Colitti
6b39032761
Merge "Add the NAT64 prefix to LinkProperties."
...
am: 983e77db4a
Change-Id: Ia1e6e1e584db12e57b245fa01651d289337906a3
2019-01-14 20:17:53 -08:00
Lorenzo Colitti
1d3bf3d90c
Test parceling empty LinkProperties.
...
Test: atest FrameworksNetTests
Change-Id: Iec53a9fdce1ba1db86751ea5f14a11d28be543eb
2019-01-15 12:53:59 +09:00
Lorenzo Colitti
ae53ea1874
Delete the clatd functions from NetworkManagementService.
...
Make Nat464Xlat talk to netd directly instead of through
NetworkManagementService. The methods in NetworkmanagementService
don't really provide any value: since the only thing they do is
call into netd, we might as well have the callers talk to netd
directly,
In order to do this, pass INetworkManagementService and INetd to
the NetworkAgentInfo constructor, and update callers appropriately.
Bug: 65674744
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: Iac4cfe709c6279e4d9682b6754963e533707bd12
2019-01-15 11:13:07 +09:00
Lorenzo Colitti
981b34f6b8
Add the NAT64 prefix to LinkProperties.
...
Currently we support exactly one NAT64 prefix. This matches what
other components in the system (Dns64Configuration, clatd, etc.)
support.
Test: atest FrameworksNetTests
Change-Id: I45a11cebe43a5e1c60d50eca7889cb317565b598
2019-01-12 02:16:34 +09:00
Chalard Jean
ee81197cf2
Merge changes from topic "IPMS1" am: 3627deac88 am: 946d156bce
...
am: 6452604181
2019-01-11 04:13:38 -08:00
Chalard Jean
6452604181
Merge changes from topic "IPMS1" am: 3627deac88
...
am: 946d156bce
2019-01-11 03:53:57 -08:00
Chalard Jean
946d156bce
Merge changes from topic "IPMS1"
...
am: 3627deac88
Change-Id: I80fc9437a041de68ce16ae5e85189b5d48fe1c97
2019-01-11 03:44:45 -08:00
Chalard Jean
6dd2486300
[MS02] Write the skeleton for the IP memory store.
...
This implements a minimal contract for the IP Memory Store
feature.
Test: Created new tests for parcelable code. For the rest, created
empty tests, but there is no logic, it's boilerplate day
Bug: 116512211
Change-Id: I15dc6275b370d671385ddfdb058a8b8d39952d6e
2019-01-11 15:01:00 +09:00
Chalard Jean
d3829de504
[MS01] Add the IP memory store service.
...
Bug: 116512211
Test: Added initial tests
Change-Id: I9d9af4097e3e2d7afd9956b9cbfa29a9f9558ae0
2019-01-11 15:00:36 +09:00
Remi NGUYEN VAN
08c771cfaf
Merge "Move NetworkMonitor to NetworkStack" am: b35979db6b am: 8255355c7d
...
am: 1ac32eff21
2019-01-10 21:39:06 -08:00
Remi NGUYEN VAN
1ac32eff21
Merge "Move NetworkMonitor to NetworkStack" am: b35979db6b
...
am: 8255355c7d
2019-01-10 21:29:38 -08:00
Remi NGUYEN VAN
8255355c7d
Merge "Move NetworkMonitor to NetworkStack"
...
am: b35979db6b
2019-01-10 21:15:28 -08:00
Remi NGUYEN VAN
b35979db6b
Merge "Move NetworkMonitor to NetworkStack"
2019-01-11 05:08:52 +00:00
Remi NGUYEN VAN
8539129ad9
Move NetworkMonitor to NetworkStack
...
Bug: b/112869080
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I1b8b6a3f4390adbabf92fb9e48da61c47b08b2ec
2019-01-11 09:59:11 +09:00
Chalard Jean
405ef49ce6
Merge "Add PCSCF to LinkProperties." am: a99e1eeb9d am: aad967ed2a
...
am: a0b40fe2e7
2019-01-09 22:29:15 -08:00
Chalard Jean
a0b40fe2e7
Merge "Add PCSCF to LinkProperties." am: a99e1eeb9d
...
am: aad967ed2a
2019-01-09 22:19:14 -08:00
Chalard Jean
aad967ed2a
Merge "Add PCSCF to LinkProperties."
...
am: a99e1eeb9d
2019-01-09 22:06:46 -08:00
Chalard Jean
a99e1eeb9d
Merge "Add PCSCF to LinkProperties."
2019-01-10 05:55:05 +00:00
Remi NGUYEN VAN
c8368a7838
Merge "Move DhcpServer to NetworkStack app" am: 82ef768e0c am: 0217604bd3
...
am: b720ab7d1d
2019-01-09 05:53:53 -08:00
Remi NGUYEN VAN
b720ab7d1d
Merge "Move DhcpServer to NetworkStack app" am: 82ef768e0c
...
am: 0217604bd3
2019-01-09 05:27:59 -08:00
Remi NGUYEN VAN
0217604bd3
Merge "Move DhcpServer to NetworkStack app"
...
am: 82ef768e0c
2019-01-09 02:53:48 -08:00
Remi NGUYEN VAN
82ef768e0c
Merge "Move DhcpServer to NetworkStack app"
2019-01-09 10:42:48 +00:00
Remi NGUYEN VAN
a35360c1b6
Move DhcpServer to NetworkStack app
...
Test: atest FrameworksNetTests && atest NetworkStackTests
Bug: b/112869080
Change-Id: I96c40e63e9ceb37b67705bdd4d120307e114715b
2019-01-09 15:42:16 +09:00
Chalard Jean
79fbf651f6
Merge "Add nullability annotations to public methods of ConnManager." am: 805e2ad9db am: 85188cead6
...
am: fb9d4e1ade
2019-01-08 00:29:39 -08:00
Chalard Jean
fb9d4e1ade
Merge "Add nullability annotations to public methods of ConnManager." am: 805e2ad9db
...
am: 85188cead6
2019-01-08 00:19:52 -08:00
Chalard Jean
85188cead6
Merge "Add nullability annotations to public methods of ConnManager."
...
am: 805e2ad9db
Change-Id: I8f5cc35869b4b76404190709206cccd895a1d4b4
2019-01-08 00:10:38 -08:00
Chalard Jean
158702db55
Add nullability annotations to public methods of ConnManager.
...
This is mainly for Kotlin compatibility.
https://android-developers.googleblog.com/2018/08/android-pie-sdk-is-now-more-kotlin.html
Bug: 122437895
Test: no logic changes
Change-Id: Ic1b9a774aee0099397b1ccfd958ff3b61d69a7fb
2019-01-07 19:35:09 +09:00
Junyu Lai
453c09eec1
Merge "Ignore ipv6 tx traffic on clat uid." am: 926c915708 am: 4d2e21a86c
...
am: 88539d94e3
2019-01-04 08:47:41 -08:00
Junyu Lai
88539d94e3
Merge "Ignore ipv6 tx traffic on clat uid." am: 926c915708
...
am: 4d2e21a86c
2019-01-04 08:30:44 -08:00
Junyu Lai
4d2e21a86c
Merge "Ignore ipv6 tx traffic on clat uid."
...
am: 926c915708
2019-01-04 08:13:29 -08:00
Junyu Lai
926c915708
Merge "Ignore ipv6 tx traffic on clat uid."
2019-01-04 09:29:10 +00:00
