Lorenzo Colitti
b1014ac0e4
Merge changes Ifa2aa335,I09366a7f am: 7fed667205 am: 1700ac64d3 am: 61074fe878
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565201
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2ac2a510eb5837acd77b2d7884da0af14cca502f
2021-02-03 16:33:10 +00:00
Lorenzo Colitti
61074fe878
Merge changes Ifa2aa335,I09366a7f am: 7fed667205 am: 1700ac64d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565201
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I75892e729ba690205bea14512edef97d271611f0
2021-02-03 15:54:14 +00:00
Lorenzo Colitti
1700ac64d3
Merge changes Ifa2aa335,I09366a7f am: 7fed667205
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565201
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id6a7c2ce8b46e448b3fa61c2ccc0050423521c52
2021-02-03 15:25:38 +00:00
Lorenzo Colitti
567edf2911
Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am: acdddac422 am: b13883951f am: 1a8680eb59
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571900
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I409cdb32c181fbd2397fbe2e2a1ff9437b755f40
2021-02-03 15:03:37 +00:00
Lorenzo Colitti
1a8680eb59
Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am: acdddac422 am: b13883951f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571900
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife8213b304f5645ed3f9f181576163aa7cec9f11
2021-02-03 14:15:05 +00:00
Lorenzo Colitti
7fed667205
Merge changes Ifa2aa335,I09366a7f
...
* changes:
Allow setting underlying networks when legacy lockdown enabled.
Allow passing the underlying network to startLegacyVpn.
2021-02-03 14:07:44 +00:00
Lorenzo Colitti
b13883951f
Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am: acdddac422
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571900
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5aafc615748eb2f854afe04108ffa7bf6d1ff47b
2021-02-03 13:32:46 +00:00
Lorenzo Colitti
acdddac422
Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method""
2021-02-03 13:05:35 +00:00
Chalard Jean
a02d3f4256
Merge "[NS] Tests : don't expect a score in NF#acceptRequest" am: c6bf15898a am: 8b1998bfb2 am: 66ab10ca12
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9e2883453e20f09a269b99ccf8e3ec86b66964b
2021-02-03 10:25:02 +00:00
Lorenzo Colitti
31f058e119
Allow setting underlying networks when legacy lockdown enabled.
...
Currently, if a legacy lockdown VPN is up, no VPN can set
underlying networks. This does not make much sense.
When legacy lockdown VPN is enabled, no other VPN is allowed to
call prepare() or establish(), so no other VPN can connect, and
if no VPN can connect, then no VPN can set underlying networks.
Therefore, disabling the ability to set underlying networks only
affects the legacy lockdown VPN itself.
This change is necessary because in a future CL, the legacy
lockdown VPN will start to inform ConnectivityService of its
underlying network.
Bug: 173331190
Test: tests in subsequent CLs in stack
Change-Id: Ifa2aa3351c2c8324571f96fda151864ed987ed5a
2021-02-03 19:04:17 +09:00
Lorenzo Colitti
94d03aecfc
Allow passing the underlying network to startLegacyVpn.
...
This will be used by a future change that makes the legacy
lockdown VPN pass the underlying network.
Bug: 173331190
Test: tests in subsequent CLs in stack
Change-Id: I09366a7f872ef3d4538962a75b0114a2ecb536e6
2021-02-03 19:03:53 +09:00
Chalard Jean
66ab10ca12
Merge "[NS] Tests : don't expect a score in NF#acceptRequest" am: c6bf15898a am: 8b1998bfb2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie057e41469e95fae8556bed47de558a54c2a05e2
2021-02-03 09:36:09 +00:00
Chalard Jean
8b1998bfb2
Merge "[NS] Tests : don't expect a score in NF#acceptRequest" am: c6bf15898a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia0039fe7dc3ccbdabe2c2d74241029a1d62456a0
2021-02-03 08:32:55 +00:00
Chalard Jean
c6bf15898a
Merge "[NS] Tests : don't expect a score in NF#acceptRequest"
2021-02-03 08:10:19 +00:00
Lorenzo Colitti
5349ba9cfc
Revert "Refactor setCurrentProxyScriptUrl to a void method"
...
This reverts commit 28fd7803b0 .
Reason for revert: Broke HostsideVpnTests
Fix: 177943140
Change-Id: I23924181e46fd1f16a60ec420426d1ed39705050
2021-02-03 07:25:29 +00:00
James Mattis
959f869760
Merge "Adding support for multiple "default" networks" am: ca0ab687be am: 24bc30f408 am: b68cb3106c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532548
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibcb06ea4004e988190ac8ae0dfaa2498d79777fb
2021-02-03 06:44:30 +00:00
James Mattis
b68cb3106c
Merge "Adding support for multiple "default" networks" am: ca0ab687be am: 24bc30f408
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532548
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic28670aa18dcdd88016733f6b258d4d19a3f358e
2021-02-03 05:46:43 +00:00
James Mattis
24bc30f408
Merge "Adding support for multiple "default" networks" am: ca0ab687be
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532548
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifeab79368573449cad035de2209db9640f861de3
2021-02-03 05:19:41 +00:00
Jeongik Cha
0a3f173136
Merge "Specify version for aidl_interface explicitly" am: 7193b792e6 am: 3de6e9c81e am: 68d7f63719
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad0b9a4fecbf0082a839a7b47fc036acc8a04f9e
2021-02-03 04:28:30 +00:00
James Mattis
ca0ab687be
Merge "Adding support for multiple "default" networks"
2021-02-03 04:17:47 +00:00
Jeongik Cha
68d7f63719
Merge "Specify version for aidl_interface explicitly" am: 7193b792e6 am: 3de6e9c81e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I67455ea4e8268e00c946cd82e9da77492157ed79
2021-02-03 03:29:57 +00:00
Jeongik Cha
3de6e9c81e
Merge "Specify version for aidl_interface explicitly" am: 7193b792e6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id433b0dc1a6619df372a050a98d8cb76bc40f5d2
2021-02-03 02:57:26 +00:00
Jeongik Cha
7193b792e6
Merge "Specify version for aidl_interface explicitly"
2021-02-03 02:21:26 +00:00
James Mattis
8af2d60519
Adding support for multiple "default" networks
...
Updating ConnectivityService foundational support for multiple default
networks by extending mDefaultRequest and mDefaultNetworkNai from single
instances to a HashMap to support more than a single default network.
Bug: 176027457
Bug: 172347841
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk
Change-Id: I2f5fa96c2d21ab883499e82afa74e73f3ca606cd
2021-02-02 16:14:36 -08:00
Treehugger Robot
633444ee84
Merge "Update frameworks to use unbundled version of BouncyCastle." am: 9671b7eca8 am: f477bba3c4 am: ec9bb8cd13
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf00137fbdfc3dacd99537f9f4e2da0ffbc9a844
2021-02-02 15:59:03 +00:00
Junyu Lai
b2481ce5f2
Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" am: 2c5d744e80 am: 6c21a4dfde am: ca31512d50
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563497
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I932566b4bb788925072e57436cd5f5fa7918a32c
2021-02-02 15:58:36 +00:00
Treehugger Robot
ec9bb8cd13
Merge "Update frameworks to use unbundled version of BouncyCastle." am: 9671b7eca8 am: f477bba3c4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I573badb280d7e351dad049c94566a68f9498f730
2021-02-02 15:34:40 +00:00
Junyu Lai
ca31512d50
Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" am: 2c5d744e80 am: 6c21a4dfde
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563497
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib2b868b8e3be84e3e16fdf9a5c216b270e76e32e
2021-02-02 15:34:23 +00:00
Treehugger Robot
f477bba3c4
Merge "Update frameworks to use unbundled version of BouncyCastle." am: 9671b7eca8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I691da785142fee5967674ac2cf1261e71c1f16e3
2021-02-02 14:41:24 +00:00
Junyu Lai
6c21a4dfde
Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" am: 2c5d744e80
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563497
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I48f029e663fe397ce0f88d2de7a758530c093012
2021-02-02 14:37:47 +00:00
Treehugger Robot
9671b7eca8
Merge "Update frameworks to use unbundled version of BouncyCastle."
2021-02-02 14:37:05 +00:00
Junyu Lai
2c5d744e80
Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API"
2021-02-02 13:57:57 +00:00
Lorenzo Colitti
89ef449561
Merge changes I4f38a539,Id4f6c7f4 am: 7b49264237 am: 6964d11672 am: 79f031dadc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565198
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I49cd86725c481827b4278e05afd4847c3a06e8d7
2021-02-02 11:49:08 +00:00
Lorenzo Colitti
79f031dadc
Merge changes I4f38a539,Id4f6c7f4 am: 7b49264237 am: 6964d11672
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565198
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I01f1b30d188e4cedcdb34bcd8f7f25ac1a5c64b4
2021-02-02 11:30:18 +00:00
Lorenzo Colitti
6964d11672
Merge changes I4f38a539,Id4f6c7f4 am: 7b49264237
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565198
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id68e4e0ff5995bbf04859834fb2aa0936ef651bc
2021-02-02 10:46:37 +00:00
Paul Hu
2dc9b85d6a
Merge "Remove ArrayUtils usage in connectivity frameworks classes" am: e59f31b85a am: 03b2f0dfda am: 63fd256cfb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564776
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia926472336a8abfa6583f29f452838056db932a8
2021-02-02 10:09:24 +00:00
Lorenzo Colitti
7b49264237
Merge changes I4f38a539,Id4f6c7f4
...
* changes:
Add the underlying networks to NetworkAgentInfo#toString.
Improve testing for network blocking.
2021-02-02 10:06:03 +00:00
Paul Hu
63fd256cfb
Merge "Remove ArrayUtils usage in connectivity frameworks classes" am: e59f31b85a am: 03b2f0dfda
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564776
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1915652c73514ea7800911222b68253e07e719a9
2021-02-02 09:32:27 +00:00
Paul Hu
03b2f0dfda
Merge "Remove ArrayUtils usage in connectivity frameworks classes" am: e59f31b85a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564776
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia8063e83503dce99985e999235ab7eb75f7cd747
2021-02-02 09:07:11 +00:00
Paul Hu
e59f31b85a
Merge "Remove ArrayUtils usage in connectivity frameworks classes"
2021-02-02 08:47:04 +00:00
Lorenzo Colitti
b852199e0a
Add the underlying networks to NetworkAgentInfo#toString.
...
This is useful in debugging VPN networks.
Bug: 173331190
Test: manual
Change-Id: I4f38a53980191a1813c2ef313fedc51af98f18f6
2021-02-02 16:17:22 +09:00
Lorenzo Colitti
786947b4ac
Improve testing for network blocking.
...
This simplifies the uidNetworkingBlocked method and makes it more
realistic by supporting more combinations of rules than just the
four used by this test.
Also support RULE_ALLOW_METERED, and add test coverage for it.
Test: test-only change
Change-Id: Id4f6c7f41429f3ae7841d3214b3e5e95ec591f85
2021-02-02 16:17:22 +09:00
Treehugger Robot
8a02f29993
Merge "Have connectivity self-register manager classes" am: 5dea66088e am: b16235f683 am: a4adae9feb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552657
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7a664bb9e9f2f835f148d0102f8b53c010bb7791
2021-02-02 06:40:07 +00:00
Treehugger Robot
a4adae9feb
Merge "Have connectivity self-register manager classes" am: 5dea66088e am: b16235f683
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552657
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I512f95a45ab23d4b7e03c196850d0dab75223620
2021-02-02 06:07:13 +00:00
Treehugger Robot
b16235f683
Merge "Have connectivity self-register manager classes" am: 5dea66088e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552657
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I73f3c0c312ae9e1786204776e98240c259416a8b
2021-02-02 05:43:12 +00:00
Lucas Lin
608940fe23
Merge "Use function inside NetdUtils instead of NetworkManagementService" am: 8ecb705379 am: 89dfaaee8d am: fd33d7f4fe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534904
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e3394be59677823631e551f83484f1a2514b274
2021-02-02 05:09:17 +00:00
Treehugger Robot
5dea66088e
Merge "Have connectivity self-register manager classes"
2021-02-02 05:01:04 +00:00
Lucas Lin
fd33d7f4fe
Merge "Use function inside NetdUtils instead of NetworkManagementService" am: 8ecb705379 am: 89dfaaee8d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534904
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2ac6a7d01878a646c4f19f6e0d54f948c7ec79eb
2021-02-02 04:41:36 +00:00
Lucas Lin
89dfaaee8d
Merge "Use function inside NetdUtils instead of NetworkManagementService" am: 8ecb705379
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534904
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibc30a45e691ec76703452595b62b588b78cd8048
2021-02-02 04:18:56 +00:00
Lucas Lin
8ecb705379
Merge "Use function inside NetdUtils instead of NetworkManagementService"
2021-02-02 03:38:38 +00:00