Commit Graph

9310 Commits

Author SHA1 Message Date
Xiao Ma
ecd7596bc1 [automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: 18511e3b08 -s ours am: b57e276a52 -s ours
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 ef40b406c5 is in history

Change-Id: I00ee1aca684632edb1f4af4a11af524f93bf52b7
2020-03-31 17:53:31 +00:00
Aaron Huang
70480a6e72 Merge "Make LinkPropertiesTest compatible with Q" am: 9d66de5d5e am: a6bdfda91b am: 3425e2651a
Change-Id: If22bcfadfc71bb8dd8be08740be202482ed23dd3
2020-03-31 17:48:44 +00:00
Android Build Merger (Role)
bba1be2bea Merge "Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f am: ec3a3796bf" into rvc-d1-dev-plus-aosp 2020-03-31 17:48:15 +00:00
TreeHugger Robot
26b4295c50 [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec -s ours am: aa7e7dabc9 -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 9eb9399321 is in history

Change-Id: I120f81565e4862505c4fe36793943d13391e2486
2020-03-31 17:47:52 +00:00
Lucas Lin
cf5be6f21d Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f
am: ec3a3796bf

Change-Id: Ia370fddf5693c67ca82043cdff2c5a35928a0e08
2020-03-31 10:47:37 -07:00
Lucas Lin
6dfffdf4c5 Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7 am: b98484701c am: ac0d8ed4e8
Change-Id: Icaefd5ae4ad814385f2aa0b83aa94a88167c8af3
2020-03-31 17:46:45 +00:00
Lucas Lin
74da2d4e59 Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f am: ec3a3796bf
Change-Id: Ia1f4f43d9192b6ad84a6f297ccf3114143b9900b
2020-03-31 17:46:00 +00:00
Remi NGUYEN VAN
edf868f706 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: e3aade0a30 am: 8b5ae551f9 -s ours am: da337f3100 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 d7d24015a5 is in history

Change-Id: I5b57ee16e81765981fb4154aa27c1be4ecb85d02
2020-03-31 17:44:07 +00:00
Benedict Wong
4ea360e537 Merge changes I97ba5903,Icd80b368 into rvc-dev am: d3d72d4452 am: 6a0996a110
Change-Id: I7f211c7a4d383523e574c8ce969ee28687a42929
2020-03-31 17:36:58 +00:00
Benedict Wong
eef8baaefd [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: c0192c1df6 am: 701b0cc046 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 feff1cde9a is in history

Change-Id: I192079b09c3fc9292fabc2208059f2c8698a9e4d
2020-03-31 17:35:12 +00:00
Benedict Wong
6a0996a110 Merge changes I97ba5903,Icd80b368 into rvc-dev am: d3d72d4452
Change-Id: I5f6ac7365512b16597abae5d9f5306a755bb4879
2020-03-31 17:12:33 +00:00
Benedict Wong
701b0cc046 Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: c0192c1df6
Change-Id: Ie0ff250e5ff36b317932053a950e49df9eae2e9f
2020-03-31 17:11:16 +00:00
Benedict Wong
d3d72d4452 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
c0192c1df6 Merge "Automatically set IPsec tunnel interface as up" into rvc-dev 2020-03-31 16:51:58 +00:00
Benedict Wong
cbb19fcba7 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
146b642363 [automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: 18511e3b08 am: c8d62edc76 -s ours
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 07a17aaa51 is in history

Change-Id: Ib49b5ab3dd1f684e760de8864d29abe8cba0ffc2
2020-03-30 18:53:50 +00:00
TreeHugger Robot
5ffa1d4723 [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec am: 85a358e793 -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 9eb9399321 is in history

Change-Id: I963ba793653967c010909d265054d0f7386ed1e2
2020-03-30 18:43:26 +00:00
Xiao Ma
c8d62edc76 Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: 18511e3b08
Change-Id: If3bf3a905dcb466fb01574b6e244c5818c6577a8
2020-03-30 08:06:39 +00:00
Xiao Ma
b57e276a52 [automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: 18511e3b08 -s ours
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 07a17aaa51 is in history

Change-Id: Ieb1ca59f2c72ac7ce731544cffeb8d48ad40561c
2020-03-30 08:06:18 +00:00
Xiao Ma
18511e3b08 Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev 2020-03-30 07:46:30 +00:00
Aaron Huang
3425e2651a Merge "Make LinkPropertiesTest compatible with Q" am: 9d66de5d5e am: a6bdfda91b
Change-Id: Ifab1167a15748d6b774ab9939562e337c73d7da7
2020-03-30 06:38:49 +00:00
Aaron Huang
a6bdfda91b Merge "Make LinkPropertiesTest compatible with Q" am: 9d66de5d5e
Change-Id: I46148a6d1db0a64006cc1e0d829a0d472a37dda3
2020-03-30 06:25:55 +00:00
Aaron Huang
9d66de5d5e Merge "Make LinkPropertiesTest compatible with Q" 2020-03-30 06:06:32 +00:00
Xiao Ma
ef40b406c5 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
85a358e793 Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec
Change-Id: Ib70529204dab1f6e43dbc46538c90f8fdddc66bc
2020-03-30 04:39:32 +00:00
TreeHugger Robot
aa7e7dabc9 [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 9eb9399321 is in history

Change-Id: Ifc19fecc1f19504a693eb8f2816c529853abbaf3
2020-03-30 04:39:24 +00:00
Lucas Lin
ac0d8ed4e8 Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7 am: b98484701c
Change-Id: I785f9d510b96acbed2925fd1af3b46829c494d1e
2020-03-30 03:42:57 +00:00
Lucas Lin
ec3a3796bf Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f
Change-Id: I02ba7c8eaeb9218815f12960c1514350b0b27399
2020-03-30 03:42:28 +00:00
Remi NGUYEN VAN
da337f3100 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: e3aade0a30 am: 8b5ae551f9 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 d7d24015a5 is in history

Change-Id: Id4a9f21ae303960d29835443517cc7ae7c87f470
2020-03-30 03:40:28 +00:00
Lucas Lin
b98484701c Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7
Change-Id: I189592ddfaa5ad75e0613f8b8468022a3af885c7
2020-03-30 03:15:44 +00:00
Lucas Lin
42cf91c65f Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4
Change-Id: I9bb5c2c32a363d384cbf89b05ea4b2a41217581e
2020-03-30 03:15:06 +00:00
Lucas Lin
28ff516ba7 Merge "Add MatchAllNetworkSpecifierTest" 2020-03-30 03:08:48 +00:00
Lucas Lin
246821b7b4 Merge "Add more tests in LinkPropertiesTests.java" 2020-03-30 03:08:40 +00:00
Remi NGUYEN VAN
8b5ae551f9 Merge "Create a builder for NetworkCapabilities." am: e3aade0a30
Change-Id: I2c78de7b501edca618441040fbe76e34ce15b08e
2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
e3aade0a30 Merge "Create a builder for NetworkCapabilities." 2020-03-30 02:58:45 +00:00
Mark Chien
9904c69fa5 Unbreak testStartUsingNetworkFeature_enableHipri failure
aosp/1261619 break legacy API that only supported for SDK which is
smaller than android M, caller need to have network stack permission
to request network with legacy type. Fix failure by whitelist permission
check for the caller who built with order SDK(< M).

Bug: 152229492
Test: atest CtsTetheringTest
      atest ConnectivityManagerLegacyTest# \
      testStartUsingNetworkFeature_enableHipri

Change-Id: I02504c0eed10ee4e08c8fbf032951022255ba5fa
Merged-In: I367dff0429f26f266282300edc38637b55eece38
(cherry picked from commit b1c8acf0d6ba1fe35d8e81673d2c5c24fa2fea79)
2020-03-30 02:26:57 +00:00
Hall Liu
12f4401a58 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: f5d30b7870 am: ab3ad14a00
Change-Id: I72c485cf9f490368f5903f11f2f14d8770f3a000
2020-03-28 07:11:35 +00:00
Hall Liu
77178f895c Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: f5d30b7870 am: c8e3578fe0
Change-Id: Idc2c2537f2fd175f1d3fbba62935b463917dc420
2020-03-28 07:10:24 +00:00
Hall Liu
c8e3578fe0 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: f5d30b7870
Change-Id: Ic9004aa98a71d52c45c88a5636970f7e156cbca0
2020-03-28 06:55:28 +00:00
Hall Liu
ab3ad14a00 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: f5d30b7870
Change-Id: I0f8dd0d1f7383e94b394cead42113c848b5b8ad4
2020-03-28 06:50:32 +00:00
Hall Liu
f5d30b7870 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev
* changes:
  Add gating, logging for PhoneStateListener's limit
  Institute limit on PhoneStateListener
2020-03-28 06:48:56 +00:00
Hall Liu
f4667b4925 Add gating, logging for PhoneStateListener's limit
Add gating via PlatformCompat and DeviceConfig and logging via
PlatformCompat to the limit instituted on per-process listeners

Fixes: 152074216
Test: atest CtsTelephonyHostCases
Change-Id: I4d6681d90705b68c3349f4124e434a29b50fd3a2
2020-03-27 19:21:51 -07:00
Chalard Jean
abeeb7442d Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: 199c91b659 am: ec85550d64
Change-Id: I394af0d00dec285120e9d2b01c58680748929dec
2020-03-27 23:07:02 +00:00
Chalard Jean
0177914f51 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: 199c91b659 am: a33e2487bc
Change-Id: I55073e2f5f5bb9293fe2871d8cf82f70ff11ef02
2020-03-27 23:02:38 +00:00
Chalard Jean
bfe9ad327a Address further API council comments. am: 812e8cb87e am: d34f9bd050
Change-Id: I501465f42c9f476637df652633d006e950d45c8a
2020-03-27 23:02:33 +00:00
Chalard Jean
88e685b6c1 Update the NetworkProvider API for council comments am: fd23dbbf07 am: 07299c8536
Change-Id: I9e17c9d45e3590f699d612977f16323cd0b908b6
2020-03-27 23:02:26 +00:00
Chalard Jean
a33e2487bc Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: 199c91b659
Change-Id: Ie0cf94ac30f7edd36aaf82344c68a18d13d7a45c
2020-03-27 22:58:45 +00:00
Chalard Jean
d34f9bd050 Address further API council comments. am: 812e8cb87e
Change-Id: I539d05a584c40606f0f27bff06e9585407b53cd8
2020-03-27 22:58:41 +00:00
Chalard Jean
07299c8536 Update the NetworkProvider API for council comments am: fd23dbbf07
Change-Id: If7798e35b8c8f4ba4b70cedd9689dcf84caf140f
2020-03-27 22:58:34 +00:00
Chalard Jean
ec85550d64 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: 199c91b659
Change-Id: I041fa5232ac2f653f0ff9070b9bcd924345f9987
2020-03-27 22:56:26 +00:00