LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,920 Commits 2 Branches 0 Tags
fcd47309c50d7ec90d1148123facfb00f4bc4da4
Commit Graph

9920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
fcd47309c5 Merge "Make the Nat464Xlat tests more realistic." am: be49675e8d am: 1cfbcd12d6 am: f1e626d293 am: 0dc1e1a402 
Change-Id: I861783880579685ea21dc96c388c361527f74097
 2020-04-20 11:55:49 +00:00
Lorenzo Colitti
c3e2ee96e6 Merge "Support learning the NAT64 prefix from two different sources." am: 35c55bc6ed am: 2418e4c269 am: 97beff86f9 am: e96495b03b 
Change-Id: Ifbbd066d0c990b92d9030ab79287243d4aed3d11
 2020-04-20 11:55:24 +00:00
Lorenzo Colitti
0dc1e1a402 Merge "Make the Nat464Xlat tests more realistic." am: be49675e8d am: 1cfbcd12d6 am: f1e626d293 
Change-Id: I31aa59d82248cbb1d2b4f51c6db0ca92e9798143
 2020-04-20 11:38:14 +00:00
Lorenzo Colitti
e96495b03b Merge "Support learning the NAT64 prefix from two different sources." am: 35c55bc6ed am: 2418e4c269 am: 97beff86f9 
Change-Id: I455df243a74d9e807e20d3aeada2bc90b565bce3
 2020-04-20 11:37:55 +00:00
Lorenzo Colitti
f1e626d293 Merge "Make the Nat464Xlat tests more realistic." am: be49675e8d am: 1cfbcd12d6 
Change-Id: Ib8d91c81af3d2e5d03c0fd47f415ff93fee5e2aa
 2020-04-20 11:37:54 +00:00
Lorenzo Colitti
97beff86f9 Merge "Support learning the NAT64 prefix from two different sources." am: 35c55bc6ed am: 2418e4c269 
Change-Id: I0c7e48c0b16fe09269ced98712bd636105f46a5c
 2020-04-20 11:37:18 +00:00
Lorenzo Colitti
1cfbcd12d6 Merge "Make the Nat464Xlat tests more realistic." am: be49675e8d 
Change-Id: I6a611b7fd7199d8c91baca39e04749ad8852a42e
 2020-04-20 11:21:17 +00:00
Lorenzo Colitti
2418e4c269 Merge "Support learning the NAT64 prefix from two different sources." am: 35c55bc6ed 
Change-Id: I8778773dab5f46aec6bf18c83d9766687307ca25
 2020-04-20 11:20:58 +00:00
Lorenzo Colitti
be49675e8d Merge "Make the Nat464Xlat tests more realistic." 2020-04-20 11:06:08 +00:00
Lorenzo Colitti
35c55bc6ed Merge "Support learning the NAT64 prefix from two different sources." 2020-04-20 11:05:52 +00:00
Lorenzo Colitti
1076d22c37 Make the Nat464Xlat tests more realistic. 
464xlat will never be started on a network that is not connected,
or on a network that has no IPv6 address.

This is a no-op test-only change but it is necessary for an
upcoming change that violates some of the invalid assumptions
currently made by this test and causes it to fail.

Bug: 150648313
Test: test-only change
Change-Id: I41766e9adaa7c24454648b371e6e3cc647693be5
 2020-04-20 17:54:20 +09:00
Aaron Huang
81635e5c0c Merge "Add network agent to enhance NetworkProvider test" am: 9f22c802c3 am: 37a275e9a9 am: 47699d24f3 am: bc2e71d17d 
Change-Id: I6514b43f01dc7796aa2199736148f93cab524413
 2020-04-20 08:47:57 +00:00
Aaron Huang
bc2e71d17d Merge "Add network agent to enhance NetworkProvider test" am: 9f22c802c3 am: 37a275e9a9 am: 47699d24f3 
Change-Id: Ieea40ecca466155a6044ac93544ed6fc5531ef1f
 2020-04-20 08:30:29 +00:00
Aaron Huang
47699d24f3 Merge "Add network agent to enhance NetworkProvider test" am: 9f22c802c3 am: 37a275e9a9 
Change-Id: I295d001e7b195c523b18b667825a84bb5e862248
 2020-04-20 08:11:44 +00:00
Lorenzo Colitti
54fb93fbde Support learning the NAT64 prefix from two different sources. 
The NAT64 prefix from the RA always takes precedence over the
NAT64 prefix from DNS discovery, because it is detected faster,
and detecting it does not require sending any packets.

Bug: 150648313
Test: new unit test
Change-Id: Ic7452431d2d9aea1ae59b67a9d8383c6cc5b3902
 2020-04-20 16:50:53 +09:00
Aaron Huang
37a275e9a9 Merge "Add network agent to enhance NetworkProvider test" am: 9f22c802c3 
Change-Id: Ib1b65aec6398f4e6a1cc2e14ec86d669be88ab74
 2020-04-20 07:41:36 +00:00
Aaron Huang
9f22c802c3 Merge "Add network agent to enhance NetworkProvider test" 2020-04-20 07:20:25 +00:00
Aaron Huang
23469c3550 Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" am: e66ba51271 am: 1b1056647b am: fbb37dbaea am: b624fff2da 
Change-Id: Ibbd62e45a885295c8f369d689369b8537acfefd4
 2020-04-17 16:04:59 +00:00
Aaron Huang
b624fff2da Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" am: e66ba51271 am: 1b1056647b am: fbb37dbaea 
Change-Id: I335f03257eb3a0b63c6b35527ff5964d677a8c40
 2020-04-17 15:40:16 +00:00
Aaron Huang
fbb37dbaea Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" am: e66ba51271 am: 1b1056647b 
Change-Id: I7fb30591e0e380f3cf75417bb1d39c81baaaa3f0
 2020-04-17 15:18:31 +00:00
Aaron Huang
1b1056647b Merge "Move DhcpInfoTest to frameworks/base/tests/net/common" am: e66ba51271 
Change-Id: I7179f2e312d1e8237b211cb60eee5c08cd759197
 2020-04-17 14:54:34 +00:00
Aaron Huang
4dd7e2fbf9 [automerger skipped] Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev am: 6be2260534 -s ours am: babaf4a6eb -s ours am: 88ec2e449d -s ours 
am skip reason: Change-Id Ic9809e731aa811a51c2f82d189372169d99a5ed9 with SHA-1 e5c0ba325d is in history

Change-Id: I1f77475f367149c1a3929dcf6bc711af9ebbd5d6
 2020-04-17 11:33:47 +00:00
Aaron Huang
c3e95384b1 [automerger skipped] Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev am: 6be2260534 am: 64e475ef4e -s ours am: b0f3c6e6e5 -s ours 
am skip reason: Change-Id Ic9809e731aa811a51c2f82d189372169d99a5ed9 with SHA-1 e5c0ba325d is in history

Change-Id: I1e0fc62e5bdda397a3db9ba8be0dcc4cae504457
 2020-04-17 11:33:10 +00:00
Aaron Huang
88ec2e449d [automerger skipped] Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev am: 6be2260534 -s ours am: babaf4a6eb -s ours 
am skip reason: Change-Id Ic9809e731aa811a51c2f82d189372169d99a5ed9 with SHA-1 e5c0ba325d is in history

Change-Id: Iec99573d8584492622e1caf85b9879ec63dada8b
 2020-04-17 11:17:21 +00:00
Aaron Huang
b0f3c6e6e5 [automerger skipped] Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev am: 6be2260534 am: 64e475ef4e -s ours 
am skip reason: Change-Id Ic9809e731aa811a51c2f82d189372169d99a5ed9 with SHA-1 e5c0ba325d is in history

Change-Id: I00a29862733b57decf62241abdc7582cacd156e6
 2020-04-17 11:17:00 +00:00
Aaron Huang
babaf4a6eb [automerger skipped] Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev am: 6be2260534 -s ours 
am skip reason: Change-Id Ic9809e731aa811a51c2f82d189372169d99a5ed9 with SHA-1 e5c0ba325d is in history

Change-Id: I581e84d6c3e77d294089c4eccc464073191f341a
 2020-04-17 11:01:43 +00:00
Aaron Huang
64e475ef4e Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev am: 6be2260534 
Change-Id: I2584b86082f224c6fdaa7e4ecc0aac52a92c3427
 2020-04-17 11:01:29 +00:00
Aaron Huang
6be2260534 Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev 2020-04-17 10:32:13 +00:00
Aaron Huang
b124dcff2c Move DhcpInfoTest to frameworks/base/tests/net/common 
Address comment from aosp/1162443.
Move to FrameworksNetCommonTests so that it can be run in
cts test and presubmit test.

Also change package name from android.net.cts to android.net

Bug: 154299158
Test: atest FrameworksNetTest
      atest CtsNetTestCasesLatestSdk:android.net.DhcpInfoTest
Change-Id: I42a965ae5cb748fdd80b4d5c0f8b26f36f74be72
 2020-04-17 18:26:20 +08:00
Aaron Huang
efd9d6903a Add network agent to enhance NetworkProvider test 
Add network agent to test more situation that could get the
onNetworkRequested callback.

Bug: 153614605
Bug: 153613690
Bug: 153612373
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkProviderTest
Change-Id: Id494a1697cc1b73e8e56ae585a69faec31c59f52
 2020-04-17 17:26:07 +08:00
Bruce Chen
079fa3d6cc [automerger skipped] Merge "Add testTransportTypesEqual to dnsmanager test cases" into rvc-dev am: 0735c5f589 am: bb3cf385bb -s ours am: 1f646ccece -s ours 
am skip reason: Change-Id I6b23ccc6ce1659fdfd9573dfcd895f2c20fa9417 with SHA-1 366d6f9ada is in history

Change-Id: Ib88ec87dd3e06f06710e2a6d503e6fd43dc3abc7
 2020-04-17 08:47:06 +00:00
Automerger Merge Worker
b6b4a9bce2 Merge "[automerger skipped] Merge "Add testTransportTypesEqual to dnsmanager test cases" into rvc-dev am: 0735c5f589 -s ours am: 24ada6df25 -s ours" into rvc-d1-dev-plus-aosp am: 82b8219cc3 -s ours 
am skip reason: Change-Id I6b23ccc6ce1659fdfd9573dfcd895f2c20fa9417 with SHA-1 366d6f9ada is in history

Change-Id: Ifc11762823812bfd7a72e4b8a93d6c0a283ed407
 2020-04-17 08:46:53 +00:00
Aaron Huang
07c36b1720 This contains a squash of two changes 
>>>>>>>>>>>>>>>>>>>>>>
aosp/1284588
Adjust permission of NetworkProvider related API

- Allow an app holds NETWORK_SETTINGS to acess registerNetworkProvier()
  and unregisterNetworkProvider().
- To access declareNetworkRequestUnfulfillable(), allow an app holds
  MANAGE_TEST_NETWORKS to declare a unfulfillable request that contains
  TRANSPORT_TEST transport.

This makes easier to write cts to test.
>>>>>>>>>>>>>>>>>>>>>>
aosp/1285957
Add cts test for NetworkProvider

It will skip whole tests on Q device since NetworkProvider class
is introduced in R.

Result on Q device would be:
[1/1] android.net.NetworkProviderTest#skippedClassForDevSdkMismatch: IGNORED (3ms)
>>>>>>>>>>>>>>>>>>>>>>
Bug: 153614605
Bug: 153613690
Bug: 153612373
Test: atest FrameworksNetTests
      atest CtsNetTestCases:android.net.NetworkProviderTest
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkProviderTest
Change-Id: Ib6f42b8f0e94e8c2715a030587e065864edff25b
Merged-In: Ic9809e731aa811a51c2f82d189372169d99a5ed9
Merged-In: If7bfc7fae503e3497c37754697d0b148ff4cab3b
(cherry picked from commit 10138d42a8f3892fcdb129a39409efe42873f6fe)
 2020-04-17 08:45:29 +00:00
Bruce Chen
1f646ccece [automerger skipped] Merge "Add testTransportTypesEqual to dnsmanager test cases" into rvc-dev am: 0735c5f589 am: bb3cf385bb -s ours 
am skip reason: Change-Id I6b23ccc6ce1659fdfd9573dfcd895f2c20fa9417 with SHA-1 366d6f9ada is in history

Change-Id: I4895ee75b1b1143fd4a05f7cc3e6adf20166fa87
 2020-04-17 08:45:01 +00:00
Bruce Chen
b197a57dc7 [automerger skipped] Merge "Add testTransportTypesEqual to dnsmanager test cases" into rvc-dev am: 0735c5f589 -s ours am: 24ada6df25 -s ours 
am skip reason: Change-Id I6b23ccc6ce1659fdfd9573dfcd895f2c20fa9417 with SHA-1 366d6f9ada is in history

Change-Id: I1b891ee48ce069985de87a0399305cb6339ed7a7
 2020-04-17 08:44:40 +00:00
Bruce Chen
bb3cf385bb Merge "Add testTransportTypesEqual to dnsmanager test cases" into rvc-dev am: 0735c5f589 
Change-Id: I652f7383c805d0f5fc2274a731f8267336da53ec
 2020-04-17 08:30:46 +00:00
Bruce Chen
24ada6df25 [automerger skipped] Merge "Add testTransportTypesEqual to dnsmanager test cases" into rvc-dev am: 0735c5f589 -s ours 
am skip reason: Change-Id I6b23ccc6ce1659fdfd9573dfcd895f2c20fa9417 with SHA-1 366d6f9ada is in history

Change-Id: Idd90cbeb0b95a28e160a3511f7239eefa51b5a92
 2020-04-17 08:30:40 +00:00
Bruce Chen
0735c5f589 Merge "Add testTransportTypesEqual to dnsmanager test cases" into rvc-dev 2020-04-17 08:25:23 +00:00
Lorenzo Colitti
0399c8413f [automerger skipped] Merge "Support changing the NAT64 prefix without removing it." into rvc-dev am: 535d087c23 -s ours am: 25e390141b -s ours am: b09e1d6e34 -s ours 
am skip reason: Change-Id I789fe9d46d3ac5d074ae697d23013f24a9e0246d with SHA-1 e5c66bd083 is in history

Change-Id: I3739e103c93fde00e1cb7985ff20a2a8bfe0b1fa
 2020-04-17 08:11:52 +00:00
Automerger Merge Worker
2b3dd1b077 Merge "[automerger skipped] Merge "Add a function to process LinkProperties coming from an agent." into rvc-dev am: 448beb4c26 -s ours am: f11e17cac5 -s ours" into rvc-d1-dev-plus-aosp am: effb2bc439 -s ours 
am skip reason: Change-Id Ibeeb5f79e8afd3350c935934713d7882f2e0281f with SHA-1 3e586b9676 is in history

Change-Id: I6d56955cc91fe012c8db82d827fdaf54a2ab59ad
 2020-04-17 08:11:39 +00:00
Lorenzo Colitti
bc359cd270 [automerger skipped] Merge "Support changing the NAT64 prefix without removing it." into rvc-dev am: 535d087c23 am: 44f4659cd1 -s ours am: 44eb07abe1 -s ours 
am skip reason: Change-Id I789fe9d46d3ac5d074ae697d23013f24a9e0246d with SHA-1 b3e329c4b3 is in history

Change-Id: I7c98d2aa67a9bcaf4d349a21565a94b83a0ad23d
 2020-04-17 08:11:23 +00:00
Automerger Merge Worker
50630827f1 Merge "[automerger skipped] Merge "Add a function to process LinkProperties coming from an agent." into rvc-dev am: 448beb4c26 am: 158e61cb28 -s ours" into rvc-d1-dev-plus-aosp am: ecd7419263 -s ours 
am skip reason: Change-Id Ibeeb5f79e8afd3350c935934713d7882f2e0281f with SHA-1 1b6f19d003 is in history

Change-Id: Id4f8e797810ed3e83ca5e36c62f74c9285883ece
 2020-04-17 08:10:41 +00:00
Lorenzo Colitti
b09e1d6e34 [automerger skipped] Merge "Support changing the NAT64 prefix without removing it." into rvc-dev am: 535d087c23 -s ours am: 25e390141b -s ours 
am skip reason: Change-Id I789fe9d46d3ac5d074ae697d23013f24a9e0246d with SHA-1 e5c66bd083 is in history

Change-Id: Iaa7de3faab9b866c81d2007cacc926b311c6214c
 2020-04-17 07:55:49 +00:00
Automerger Merge Worker
effb2bc439 Merge "[automerger skipped] Merge "Add a function to process LinkProperties coming from an agent." into rvc-dev am: 448beb4c26 -s ours am: f11e17cac5 -s ours" into rvc-d1-dev-plus-aosp 2020-04-17 07:55:46 +00:00
Lorenzo Colitti
9a326007a1 [automerger skipped] Merge "Add a function to process LinkProperties coming from an agent." into rvc-dev am: 448beb4c26 -s ours am: f11e17cac5 -s ours 
am skip reason: Change-Id Ibeeb5f79e8afd3350c935934713d7882f2e0281f with SHA-1 3e586b9676 is in history

Change-Id: Ib7fc14983371f88523d4d0512a3288b69f277bac
 2020-04-17 07:55:37 +00:00
Lorenzo Colitti
44eb07abe1 [automerger skipped] Merge "Support changing the NAT64 prefix without removing it." into rvc-dev am: 535d087c23 am: 44f4659cd1 -s ours 
am skip reason: Change-Id I789fe9d46d3ac5d074ae697d23013f24a9e0246d with SHA-1 b3e329c4b3 is in history

Change-Id: I9fa685a014e4b0fb4550bd92be524c92a70d826a
 2020-04-17 07:55:32 +00:00
Lorenzo Colitti
54700a93d1 [automerger skipped] Merge "Add a function to process LinkProperties coming from an agent." into rvc-dev am: 448beb4c26 am: 158e61cb28 -s ours 
am skip reason: Change-Id Ibeeb5f79e8afd3350c935934713d7882f2e0281f with SHA-1 1b6f19d003 is in history

Change-Id: I001da61f217e065b1829663a5ae6aad481ac6b7c
 2020-04-17 07:54:59 +00:00
Lorenzo Colitti
44f4659cd1 Merge "Support changing the NAT64 prefix without removing it." into rvc-dev am: 535d087c23 
Change-Id: Id40e2345fceb28434ff612267c0fefb57a85898d
 2020-04-17 07:28:32 +00:00
Lorenzo Colitti
158e61cb28 Merge "Add a function to process LinkProperties coming from an agent." into rvc-dev am: 448beb4c26 
Change-Id: I69373207be56e00686ce0a789c94104e481c00da
 2020-04-17 07:28:10 +00:00
Lorenzo Colitti
25e390141b [automerger skipped] Merge "Support changing the NAT64 prefix without removing it." into rvc-dev am: 535d087c23 -s ours 
am skip reason: Change-Id I789fe9d46d3ac5d074ae697d23013f24a9e0246d with SHA-1 b3e329c4b3 is in history

Change-Id: If5a81dac82fa47a29db835577eaad0cf706b49ba
 2020-04-17 07:27:53 +00:00