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
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
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
Remi NGUYEN VAN
15f85cd5f2
Merge "Add stable AIDL parcelables for LinkProperties" am: c37177a7d6
...
am: e45592f5fd
Change-Id: I301f9ccac2008c102dbc5e14e3654cf268e20d1d
2019-01-17 00:55:38 -08:00
Remi NGUYEN VAN
c37177a7d6
Merge "Add stable AIDL parcelables for LinkProperties"
2019-01-17 08:30:18 +00:00
Remi NGUYEN VAN
4855a2e2c6
Add stable AIDL parcelables for LinkProperties
...
Test: atest android.net.shared.LinkPropertiesParcelableUtilTest
Bug: b/112869080
Change-Id: I2b69980e25bae9f51fb5b8cd3cafb403e6bd53da
2019-01-17 13:11:12 +09:00
Chalard Jean
abf3769f79
Merge changes I09167532,I7df77a99,I67797b3f,Ic27e706f am: 796c9446f7 am: 18e166a11b
...
am: 87d8e82e20
Change-Id: If096c80bc287402ff3b35a0a1bb12dbf65efdda0
2019-01-16 04:53:42 -08:00
Chalard Jean
87d8e82e20
Merge changes I09167532,I7df77a99,I67797b3f,Ic27e706f am: 796c9446f7
...
am: 18e166a11b
Change-Id: I174716764b2d6e441547d4fbad4043cdbf0f8ad9
2019-01-16 04:42:18 -08:00
Chalard Jean
796c9446f7
Merge changes I09167532,I7df77a99,I67797b3f,Ic27e706f
...
* changes:
[MS06] Add the relevance utils.
[MS05] Pretty print the data classes of IPMS.
[MS04] Add an executor to the memory store.
[MS03] Add the contract for the IPMS database.
2019-01-16 12:14:46 +00:00
Remi NGUYEN VAN
a7943e2578
Merge "Add Nat64Prefix to LinkProperties copy constructor" am: d1df42bbb9 am: 7817393ef9
...
am: 7609eb5667
Change-Id: I79e600d35770710f07adc55e9a7c55eb7c0f5ff1
2019-01-16 01:06:17 -08:00
Remi NGUYEN VAN
7609eb5667
Merge "Add Nat64Prefix to LinkProperties copy constructor" am: d1df42bbb9
...
am: 7817393ef9
Change-Id: I793230bd65e24c5976849e860defa159cf22507b
2019-01-16 00:57:04 -08:00
Remi NGUYEN VAN
b68c3499c1
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
Chalard Jean
8fe503f192
[MS05] Pretty print the data classes of IPMS.
...
Test: A commando of monkeys has been dispatched to make sure
this pretty-printing is very, very pretty.
Also one human has made sure of this by printing instances
to the log.
Bug: 116512211
Change-Id: I7df77a997a982a0b3d444502cc69de5544f70736
2019-01-15 14:16:07 +09:00
Chalard Jean
61e27abf28
[MS03] Add the contract for the IPMS database.
...
Test: Some more boilerplate that doesn't exactly need tests as such.
The important thing is that the database can store and retrieve
data, not that it creates as specific file or schema.
Bug: 116512211
Change-Id: Ic27e706f15754b34d7bc26626a92d895a15a083d
2019-01-15 14:12:39 +09:00
Lorenzo Colitti
00b6b09fb5
Merge "Add the NAT64 prefix to LinkProperties." am: 983e77db4a am: a63453bf68
...
am: 756b260800
Change-Id: I53948d2c3f50b9973e5b9483cf172b5932028f51
2019-01-14 20:40:25 -08:00
Lorenzo Colitti
756b260800
Merge "Add the NAT64 prefix to LinkProperties." am: 983e77db4a
...
am: a63453bf68
Change-Id: I808042e00cbc1da8d3e878add9b643a75968919e
2019-01-14 20:29:10 -08:00
Lorenzo Colitti
59b34472c9
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
fc758be231
Merge changes from topic "IPMS1" am: 3627deac88 am: 54d91e605c
...
am: 2304c7c508
Change-Id: I6908f68b1b9e7079384c4cc9f11c4e46cce694ce
2019-01-11 04:13:38 -08:00
Chalard Jean
2304c7c508
Merge changes from topic "IPMS1" am: 3627deac88
...
am: 54d91e605c
Change-Id: I2541996b9bfe338acabac858fdea0ad89d55df5b
2019-01-11 03:53:57 -08:00
Chalard Jean
f89d7bee9e
[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
8c141bdb8f
[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
7e425036a6
Merge "Move NetworkMonitor to NetworkStack" am: 81552d610a am: 8ecc6c9e32
...
am: 935a491a59
Change-Id: Ia5d742bd5186e92b8a45bb72fb414b9dbdd38f78
2019-01-10 21:39:06 -08:00
Remi NGUYEN VAN
935a491a59
Merge "Move NetworkMonitor to NetworkStack" am: 81552d610a
...
am: 8ecc6c9e32
Change-Id: I438b95e135d0d86be53ea3a8ab61105a886e2a2e
2019-01-10 21:29:38 -08:00
Remi NGUYEN VAN
81552d610a
Merge "Move NetworkMonitor to NetworkStack"
2019-01-11 05:08:52 +00:00
Remi NGUYEN VAN
e67b0c3aee
Move NetworkMonitor to NetworkStack
...
Bug: b/112869080
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I1b8b6a3f4390adbabf92fb9e48da61c47b08b2ec
2019-01-11 09:59:11 +09:00
Chalard Jean
036da579e2
Merge "Add PCSCF to LinkProperties." am: 64e495b274 am: 40c9e752ac
...
am: e2bbcc1837
Change-Id: I16eedc51ad4932b7ec6a32d9e718c48cf203c2f0
2019-01-09 22:29:15 -08:00
Chalard Jean
e2bbcc1837
Merge "Add PCSCF to LinkProperties." am: 64e495b274
...
am: 40c9e752ac
Change-Id: I491e99f7225233d5841b61ce383325e7a1c43fa0
2019-01-09 22:19:14 -08:00
Chalard Jean
64e495b274
Merge "Add PCSCF to LinkProperties."
2019-01-10 05:55:05 +00:00
Remi NGUYEN VAN
db24f2f8c8
Merge "Move DhcpServer to NetworkStack app" am: 94e5b22985 am: d495691bd5
...
am: 4bdc06e174
Change-Id: I466c7cefbd30b05708e2d2201ca46fa5bcbb6ff9
2019-01-09 05:53:53 -08:00
Remi NGUYEN VAN
4bdc06e174
Merge "Move DhcpServer to NetworkStack app" am: 94e5b22985
...
am: d495691bd5
Change-Id: Ib25c0422fda31c5df7743b481d5f50da209c38fa
2019-01-09 05:27:59 -08:00
Remi NGUYEN VAN
94e5b22985
Merge "Move DhcpServer to NetworkStack app"
2019-01-09 10:42:48 +00:00
Remi NGUYEN VAN
0e3d0923a6
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
5ceb006d4d
Merge "Add nullability annotations to public methods of ConnManager." am: 805e2ad9db am: 59c8590f7b
...
am: 0b08cd3e1a
Change-Id: I156f825d4f878ef9de394b38abb934de96b01038
2019-01-08 00:29:39 -08:00
Chalard Jean
0b08cd3e1a
Merge "Add nullability annotations to public methods of ConnManager." am: 805e2ad9db
...
am: 59c8590f7b
Change-Id: If2e704e1f8ddf504be9e777ec226b2ce524438dc
2019-01-08 00:19:52 -08:00
Chalard Jean
805e2ad9db
Merge "Add nullability annotations to public methods of ConnManager."
2019-01-08 07:58:13 +00:00
Remi NGUYEN VAN
98feb88705
Merge "Add parceling for DhcpServingParams" am: f6209cf0dd am: 133f281d12
...
am: 815bd36c07
Change-Id: I953b4380baba93d992601ebde39d7cd63b5bdc3a
2019-01-07 18:30:36 -08:00
Remi NGUYEN VAN
815bd36c07
Merge "Add parceling for DhcpServingParams" am: f6209cf0dd
...
am: 133f281d12
Change-Id: Icab36165187d204de5fdbc4f4271e758ebaebed8
2019-01-07 18:16:49 -08:00
Chalard Jean
50bea3d084
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
Remi NGUYEN VAN
761198a05d
Add parceling for DhcpServingParams
...
Introduce a stable AIDL parcel class, DhcpServingParamsParcel, and
methods to convert to and from that class to DhcpServingParams.
This will be used to move DhcpServer to the NetworkStack app.
Test: atest FrameworksNetTests
Bug: b/112869080
Change-Id: I276b7affccb938059769c90a53f0f6beb26e6ede
2019-01-07 12:07:18 +09:00
Junyu Lai
864ead76b1
Merge "Ignore ipv6 tx traffic on clat uid." am: bd73798585 am: cb53e78f56
...
am: 3c6bc9b14d
Change-Id: I1ac85ac863026ea99117c5b0115bcc0c9144fb7b
2019-01-04 08:47:41 -08:00
Junyu Lai
3c6bc9b14d
Merge "Ignore ipv6 tx traffic on clat uid." am: bd73798585
...
am: cb53e78f56
Change-Id: I0f289ce46462f494adb99628bd504cafb584eeeb
2019-01-04 08:30:44 -08:00
Junyu Lai
bd73798585
Merge "Ignore ipv6 tx traffic on clat uid."
2019-01-04 09:29:10 +00:00