Commit Graph

9512 Commits

Author SHA1 Message Date
Aaron Huang
d29b39ba68 Merge "Make LinkPropertiesTest compatible with Q" am: 0e9d759c56 am: a62a8a0b63 am: 7dae24c85d am: 678ea74867 am: b63669409e
Change-Id: I223ea3a9ccf2ba3c35ed3b31b88c6f83e0aae970
2020-03-31 18:43:09 +00:00
Android Build Merger (Role)
7575359517 Merge "Merge "Add more tests in LinkPropertiesTests.java" am: 23890535a1 am: a777fa382d am: 12f263070d" into rvc-d1-dev-plus-aosp am: 99e65a1d50 am: 6d99713d91
Change-Id: I5c2df75c9bffa7091289a18805e7b7ab5cb63cde
2020-03-31 18:39:10 +00:00
TreeHugger Robot
dde625046f [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec -s ours am: 741d811fb7 -s ours am: 8ea9837c96 -s ours am: 030b39aaed -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 7fae6eae10 is in history

Change-Id: I2abdd189043ba2863af40abda704dfdd6eae03ca
2020-03-31 18:38:07 +00:00
Lucas Lin
2a1dcc0043 Merge "Add MatchAllNetworkSpecifierTest" am: d410caa3b1 am: ca71c1d1ae am: c79beb1071 am: a0c672766c am: a04440d1a0
Change-Id: I6c6911041aff1b245e576109a879247cc256093b
2020-03-31 18:35:12 +00:00
Lucas Lin
a98716ed93 Merge "Add more tests in LinkPropertiesTests.java" am: 23890535a1 am: a777fa382d am: 12f263070d am: 58ddf22c94 am: aa256ab3aa
Change-Id: I2bae76dc93e7aa02efe25dca4b6e99692c79135a
2020-03-31 18:31:33 +00:00
Remi NGUYEN VAN
430fe63bd8 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: 9259da76fb am: aa3677342f -s ours am: 71700b6bdb -s ours am: 996f83d030 -s ours am: 1808663826 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 dfcbc07b3e is in history

Change-Id: Iec9c771adfcec5dcc5c95d701d69ab338e83b16f
2020-03-31 18:29:44 +00:00
Aaron Huang
b63669409e Merge "Make LinkPropertiesTest compatible with Q" am: 0e9d759c56 am: a62a8a0b63 am: 7dae24c85d am: 678ea74867
Change-Id: I410219c77ca4758daeef993642c2ed31b6556e28
2020-03-31 18:02:17 +00:00
Benedict Wong
22a316a8e6 Merge changes I97ba5903,Icd80b368 into rvc-dev am: a7e71febc5 am: 2933f38880 am: 6c31dbbf08 am: ba1c34d2ea
Change-Id: I23bd1b785a0b9920c9f2402d92e6b0c00362cf87
2020-03-31 18:02:09 +00:00
Android Build Merger (Role)
6d99713d91 Merge "Merge "Add more tests in LinkPropertiesTests.java" am: 23890535a1 am: a777fa382d am: 12f263070d" into rvc-d1-dev-plus-aosp am: 99e65a1d50
Change-Id: Icc421206856eddb895ffd5bab2bd25a06dd4fd2e
2020-03-31 18:02:06 +00:00
TreeHugger Robot
030b39aaed [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec -s ours am: 741d811fb7 -s ours am: 8ea9837c96 -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 7fae6eae10 is in history

Change-Id: Iad66a5db886439acaba8ce4fbfe1e36496c869b7
2020-03-31 18:01:47 +00:00
Benedict Wong
0d2418eb4a [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: 61cd22fe3e am: 69c8858e8a -s ours am: c4bea9a826 -s ours am: 12edbb7ad4 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 5a09daaa7f is in history

Change-Id: Idd284ae5b7213d78e72368db6744f55bff651b91
2020-03-31 18:01:25 +00:00
Lucas Lin
a04440d1a0 Merge "Add MatchAllNetworkSpecifierTest" am: d410caa3b1 am: ca71c1d1ae am: c79beb1071 am: a0c672766c
Change-Id: Ib09c3e20e146bab4789c1e0d4ad2757b7f5a85e1
2020-03-31 18:01:22 +00:00
Lucas Lin
aa256ab3aa Merge "Add more tests in LinkPropertiesTests.java" am: 23890535a1 am: a777fa382d am: 12f263070d am: 58ddf22c94
Change-Id: I60ca1484a661eb1ab2f0ed9dfe76f57b18423325
2020-03-31 18:01:05 +00:00
Remi NGUYEN VAN
1808663826 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: 9259da76fb am: aa3677342f -s ours am: 71700b6bdb -s ours am: 996f83d030 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 dfcbc07b3e is in history

Change-Id: I8f96e4066e1a78b7f60e3488ac73669a2c9bfb6e
2020-03-31 18:00:26 +00:00
Aaron Huang
678ea74867 Merge "Make LinkPropertiesTest compatible with Q" am: 0e9d759c56 am: a62a8a0b63 am: 7dae24c85d
Change-Id: If22bcfadfc71bb8dd8be08740be202482ed23dd3
2020-03-31 17:48:44 +00:00
Android Build Merger (Role)
99e65a1d50 Merge "Merge "Add more tests in LinkPropertiesTests.java" am: 23890535a1 am: a777fa382d am: 12f263070d" into rvc-d1-dev-plus-aosp 2020-03-31 17:48:15 +00:00
TreeHugger Robot
8ea9837c96 [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec -s ours am: 741d811fb7 -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 7fae6eae10 is in history

Change-Id: I120f81565e4862505c4fe36793943d13391e2486
2020-03-31 17:47:52 +00:00
Lucas Lin
b28c1f0797 Merge "Add more tests in LinkPropertiesTests.java" am: 23890535a1 am: a777fa382d
am: 12f263070d

Change-Id: Ia370fddf5693c67ca82043cdff2c5a35928a0e08
2020-03-31 10:47:37 -07:00
Lucas Lin
a0c672766c Merge "Add MatchAllNetworkSpecifierTest" am: d410caa3b1 am: ca71c1d1ae am: c79beb1071
Change-Id: Icaefd5ae4ad814385f2aa0b83aa94a88167c8af3
2020-03-31 17:46:45 +00:00
Lucas Lin
58ddf22c94 Merge "Add more tests in LinkPropertiesTests.java" am: 23890535a1 am: a777fa382d am: 12f263070d
Change-Id: Ia1f4f43d9192b6ad84a6f297ccf3114143b9900b
2020-03-31 17:46:00 +00:00
Remi NGUYEN VAN
996f83d030 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: 9259da76fb am: aa3677342f -s ours am: 71700b6bdb -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 dfcbc07b3e is in history

Change-Id: I5b57ee16e81765981fb4154aa27c1be4ecb85d02
2020-03-31 17:44:07 +00:00
Benedict Wong
ba1c34d2ea Merge changes I97ba5903,Icd80b368 into rvc-dev am: a7e71febc5 am: 2933f38880 am: 6c31dbbf08
Change-Id: Ie4e32d88c8830ca9b6152c9dfbaedbe9274fb326
2020-03-31 17:40:56 +00:00
Benedict Wong
12edbb7ad4 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: 61cd22fe3e am: 69c8858e8a -s ours am: c4bea9a826 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 5a09daaa7f is in history

Change-Id: I669f28648e3d6c912ab48df415e164def0c9a1a2
2020-03-31 17:40:17 +00:00
Benedict Wong
6c31dbbf08 Merge changes I97ba5903,Icd80b368 into rvc-dev am: a7e71febc5 am: 2933f38880
Change-Id: I7f211c7a4d383523e574c8ce969ee28687a42929
2020-03-31 17:36:58 +00:00
Benedict Wong
c4bea9a826 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: 61cd22fe3e am: 69c8858e8a -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 5a09daaa7f is in history

Change-Id: I192079b09c3fc9292fabc2208059f2c8698a9e4d
2020-03-31 17:35:12 +00:00
Benedict Wong
2933f38880 Merge changes I97ba5903,Icd80b368 into rvc-dev am: a7e71febc5
Change-Id: I5f6ac7365512b16597abae5d9f5306a755bb4879
2020-03-31 17:12:33 +00:00
Benedict Wong
69c8858e8a Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: 61cd22fe3e
Change-Id: Ie0ff250e5ff36b317932053a950e49df9eae2e9f
2020-03-31 17:11:16 +00:00
Benedict Wong
a7e71febc5 Merge changes I97ba5903,Icd80b368 into rvc-dev
* changes:
  Make VpnProfile.maxMtu default value match Ikev2VpnProfile
  Add negotiated DNS servers to VPN config
2020-03-31 16:52:04 +00:00
Benedict Wong
61cd22fe3e Merge "Automatically set IPsec tunnel interface as up" into rvc-dev 2020-03-31 16:51:58 +00:00
Benedict Wong
fad1dfe2a3 Make VpnProfile.maxMtu default value match Ikev2VpnProfile
This change corrects the VpnProfile's maxMtu defaults to match that of
the Ikev2VpnProfile. 1400 is too high as a default, and Settings will
run into an issue here quite often.

Bug: 152573931
Test: FrameworksNetTests passing
Change-Id: I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c
Merged-In: I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c
(cherry picked from commit d0a44f49df01a1aefa505ee90c9806dee135b4e4)
2020-03-30 22:59:17 -07:00
Xiao Ma
5e9231e1ae [automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: ac27736c5b am: 0897bef5b2 -s ours am: 9b05657c0d -s ours am: 492060e14c -s ours
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 e43c74d97e is in history

Change-Id: I555cc9208246b2fe143dba16b37f379bc005fa31
2020-03-31 04:58:18 +00:00
TreeHugger Robot
021845f832 [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec am: acd7932d24 -s ours am: 3306a97c1d -s ours am: 005efa9769 -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 7fae6eae10 is in history

Change-Id: Ib13d7b34ac8fe3f8f7c2b1a316cdaf40b15db934
2020-03-31 04:55:07 +00:00
Xiao Ma
a836a2c6dd [automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: ac27736c5b am: 0897bef5b2 am: f44579c205 am: ba7c254fc2 -s ours am: c73a2f9e15 -s ours
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 8d46a09b50 is in history

Change-Id: I70b9145364fae8a453e2c2f5244e5b9c9b383723
2020-03-30 22:00:42 +00:00
TreeHugger Robot
85e7bdd875 [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec am: acd7932d24 am: d5d24218a0 am: 0b80c024f1 -s ours am: 4ac44d7ce2 -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 7fae6eae10 is in history

Change-Id: Id933e543586895ab0cd220218f5bb5ca7cb230f6
2020-03-30 19:11:47 +00:00
Xiao Ma
492060e14c [automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: ac27736c5b am: 0897bef5b2 -s ours am: 9b05657c0d -s ours
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 e43c74d97e is in history

Change-Id: If3ade5493b13c84d1fc6b889a42c63d02f15c77a
2020-03-30 19:04:23 +00:00
TreeHugger Robot
005efa9769 [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec am: acd7932d24 -s ours am: 3306a97c1d -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 7fae6eae10 is in history

Change-Id: I0c55d53bdc68424b14758055faa909ce5eba867c
2020-03-30 19:02:42 +00:00
Xiao Ma
9b05657c0d [automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: ac27736c5b am: 0897bef5b2 -s ours
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 8d46a09b50 is in history

Change-Id: Ib49b5ab3dd1f684e760de8864d29abe8cba0ffc2
2020-03-30 18:53:50 +00:00
TreeHugger Robot
3306a97c1d [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec am: acd7932d24 -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 7fae6eae10 is in history

Change-Id: I963ba793653967c010909d265054d0f7386ed1e2
2020-03-30 18:43:26 +00:00
Xiao Ma
c73a2f9e15 [automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: ac27736c5b am: 0897bef5b2 am: f44579c205 am: ba7c254fc2 -s ours
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 8d46a09b50 is in history

Change-Id: Icef59d90e55dfd31f4f780c1dd0dbff427eff64e
2020-03-30 18:13:02 +00:00
TreeHugger Robot
4ac44d7ce2 [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec am: acd7932d24 am: d5d24218a0 am: 0b80c024f1 -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 7fae6eae10 is in history

Change-Id: I3ec8dd29f31add5b4d216c0446f0c77d6866ba0a
2020-03-30 18:10:43 +00:00
Xiao Ma
0897bef5b2 Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: ac27736c5b
Change-Id: If3bf3a905dcb466fb01574b6e244c5818c6577a8
2020-03-30 08:06:39 +00:00
Xiao Ma
ac27736c5b Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev 2020-03-30 07:46:30 +00:00
Aaron Huang
7dae24c85d Merge "Make LinkPropertiesTest compatible with Q" am: 0e9d759c56 am: a62a8a0b63
Change-Id: Ifab1167a15748d6b774ab9939562e337c73d7da7
2020-03-30 06:38:49 +00:00
Aaron Huang
a62a8a0b63 Merge "Make LinkPropertiesTest compatible with Q" am: 0e9d759c56
Change-Id: I46148a6d1db0a64006cc1e0d829a0d472a37dda3
2020-03-30 06:25:55 +00:00
Aaron Huang
0e9d759c56 Merge "Make LinkPropertiesTest compatible with Q" 2020-03-30 06:06:32 +00:00
Xiao Ma
e43c74d97e Add CTS tests for ApfCapabilities static APIs.
Add tests for getApfEtherTypeBlackList and getApfDrop8023Frames APIs.

Bug: 150640397
Test: atest CtsNetTestCasesLatestSdk:android.net.apf.ApfCapabilitiesTest
      on both of Q and R devices.

Change-Id: I11555934df4b27cbb6b7ddbb81022d8fb7c25e15
Merged-In: I11555934df4b27cbb6b7ddbb81022d8fb7c25e15
(cherry picked from commit 7d51a72487dba5b2747a9de12f50ba2087007264)
2020-03-30 05:41:02 +00:00
TreeHugger Robot
acd7932d24 Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec
Change-Id: Ib70529204dab1f6e43dbc46538c90f8fdddc66bc
2020-03-30 04:39:32 +00:00
TreeHugger Robot
741d811fb7 [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 7fae6eae10 is in history

Change-Id: Ifc19fecc1f19504a693eb8f2816c529853abbaf3
2020-03-30 04:39:24 +00:00
Lucas Lin
c79beb1071 Merge "Add MatchAllNetworkSpecifierTest" am: d410caa3b1 am: ca71c1d1ae
Change-Id: I785f9d510b96acbed2925fd1af3b46829c494d1e
2020-03-30 03:42:57 +00:00
Lucas Lin
12f263070d Merge "Add more tests in LinkPropertiesTests.java" am: 23890535a1 am: a777fa382d
Change-Id: I02ba7c8eaeb9218815f12960c1514350b0b27399
2020-03-30 03:42:28 +00:00