Commit Graph

9294 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Remi NGUYEN VAN
71700b6bdb [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: 9259da76fb am: aa3677342f -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 dfcbc07b3e is in history

Change-Id: Id4a9f21ae303960d29835443517cc7ae7c87f470
2020-03-30 03:40:28 +00:00
Lucas Lin
a777fa382d Merge "Add more tests in LinkPropertiesTests.java" am: 23890535a1
Change-Id: I9bb5c2c32a363d384cbf89b05ea4b2a41217581e
2020-03-30 03:15:06 +00:00
Lucas Lin
23890535a1 Merge "Add more tests in LinkPropertiesTests.java" 2020-03-30 03:08:40 +00:00
Remi NGUYEN VAN
aa3677342f Merge "Create a builder for NetworkCapabilities." am: 9259da76fb
Change-Id: I2c78de7b501edca618441040fbe76e34ce15b08e
2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
9259da76fb Merge "Create a builder for NetworkCapabilities." 2020-03-30 02:58:45 +00:00
Mark Chien
41a28cae9d 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
f29d962e75 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: 9a5e26ef77 am: c8d19b2482
Change-Id: I72c485cf9f490368f5903f11f2f14d8770f3a000
2020-03-28 07:11:35 +00:00
Hall Liu
2fa88bc8a8 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: 9a5e26ef77 am: 921f9b4572
Change-Id: Idc2c2537f2fd175f1d3fbba62935b463917dc420
2020-03-28 07:10:24 +00:00
Hall Liu
921f9b4572 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: 9a5e26ef77
Change-Id: Ic9004aa98a71d52c45c88a5636970f7e156cbca0
2020-03-28 06:55:28 +00:00
Hall Liu
c8d19b2482 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: 9a5e26ef77
Change-Id: I0f8dd0d1f7383e94b394cead42113c848b5b8ad4
2020-03-28 06:50:32 +00:00
Hall Liu
9a5e26ef77 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
2ca7c9a422 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
c82408c42b Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: f7c2921f91 am: 962be5ead0
Change-Id: I394af0d00dec285120e9d2b01c58680748929dec
2020-03-27 23:07:02 +00:00
Chalard Jean
e08baf1e3b Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: f7c2921f91 am: bc5149723a
Change-Id: I55073e2f5f5bb9293fe2871d8cf82f70ff11ef02
2020-03-27 23:02:38 +00:00
Chalard Jean
ba6f549dc5 Address further API council comments. am: c882f64b3c am: 2616b2bbb0
Change-Id: I501465f42c9f476637df652633d006e950d45c8a
2020-03-27 23:02:33 +00:00
Chalard Jean
71c3b6cb9c Update the NetworkProvider API for council comments am: 4c7368a340 am: 750bd91aa5
Change-Id: I9e17c9d45e3590f699d612977f16323cd0b908b6
2020-03-27 23:02:26 +00:00
Chalard Jean
bc5149723a Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: f7c2921f91
Change-Id: Ie0cf94ac30f7edd36aaf82344c68a18d13d7a45c
2020-03-27 22:58:45 +00:00
Chalard Jean
2616b2bbb0 Address further API council comments. am: c882f64b3c
Change-Id: I539d05a584c40606f0f27bff06e9585407b53cd8
2020-03-27 22:58:41 +00:00
Chalard Jean
750bd91aa5 Update the NetworkProvider API for council comments am: 4c7368a340
Change-Id: If7798e35b8c8f4ba4b70cedd9689dcf84caf140f
2020-03-27 22:58:34 +00:00
Chalard Jean
962be5ead0 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: f7c2921f91
Change-Id: I041fa5232ac2f653f0ff9070b9bcd924345f9987
2020-03-27 22:56:26 +00:00
Chalard Jean
f7c2921f91 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
  Update the NetworkProvider API for council comments
2020-03-27 22:50:42 +00:00
Cody Kesting
5ad0111a2d [automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: fc0eed5aa6 am: ede1ab6af0 -s ours
am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 aa7f80a5d8 is in history

Change-Id: I02312f60a1d41a2dcc9e9ba655e7542a450b4ddb
2020-03-27 19:39:04 +00:00
Cody Kesting
2f7595de71 [automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: fc0eed5aa6 -s ours am: da504db4c6 -s ours
am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 081da59c0e is in history

Change-Id: Iabd4f83d8e7308789135f407bbe9a550b75652ec
2020-03-27 19:33:30 +00:00
Cody Kesting
ede1ab6af0 Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: fc0eed5aa6
Change-Id: Icff8ed1cf90927e521c8294aaec8bfdd6a4ccc4d
2020-03-27 19:23:37 +00:00
Cody Kesting
da504db4c6 [automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: fc0eed5aa6 -s ours
am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 081da59c0e is in history

Change-Id: I2e8071232c2a866f1c6540cb2d43988d30a4ee65
2020-03-27 19:22:07 +00:00
Cody Kesting
fc0eed5aa6 Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev 2020-03-27 19:09:00 +00:00
Automerger Merge Worker
661eff54e7 Merge "[automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734 am: f4597a69da -s ours" into rvc-d1-dev-plus-aosp 2020-03-27 18:54:39 +00:00
Cody Kesting
99692a13db [automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734 am: f4597a69da -s ours
am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 e385a7a90a is in history

Change-Id: I0e495d8cc6bc172bdb248cefd6d812c5918fe1f7
2020-03-27 18:54:33 +00:00
Cody Kesting
06b84a0e09 [automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734 -s ours am: b7e7fac6ef -s ours
am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 e385a7a90a is in history

Change-Id: I57e4ada96a1fc0f95f9a90fed17a04753a7ce73f
2020-03-27 18:54:27 +00:00
Cody Kesting
f4597a69da Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734
Change-Id: Ibd8c0920b66899d36058f249904d33fe14ce9504
2020-03-27 18:38:07 +00:00
Cody Kesting
b7e7fac6ef [automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734 -s ours
am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 e385a7a90a is in history

Change-Id: I2a85d7ddc2fc3e6594e19591b589014d65b8b6f7
2020-03-27 18:35:43 +00:00
Cody Kesting
488c8e4734 Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev 2020-03-27 18:22:20 +00:00
Mark Chien
2f8d886890 Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: db96b34bf7 am: 10f581540e am: 1be7fb946c
Change-Id: I51f00fb99526557181cedb7542cce8d10b362a11
2020-03-27 16:20:07 +00:00
Mark Chien
1be7fb946c Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: db96b34bf7 am: 10f581540e
Change-Id: Ifedc9c8825550bc5ec5c32c46d0cd0f48d016b5e
2020-03-27 15:58:49 +00:00