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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-02-03 15:25:38 +00:00
1700ac64d3
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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-02-03 14:15:05 +00:00
1a8680eb59
Merge changes Ifa2aa335,I09366a7f
...
* changes:
Allow setting underlying networks when legacy lockdown enabled.
Allow passing the underlying network to startLegacyVpn.
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2021-02-03 14:07:44 +00:00
7fed667205
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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-02-03 13:32:46 +00:00
b13883951f
Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method""
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2021-02-03 13:05:35 +00:00
acdddac422
Move shared methods to net shared lib
...
The NetworkUtils.getNetworkPart() method is used by Settings
and wifi. NetworkUtils is inside the incoming connectivity
module. It will become inaccessible outside the module, so
move the shared methods to shared lib and also move the
related helper method.
The corresponding usgae is also updated.
Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: I47410afa27aad61f63759df41be959f323c1d100
Chiachang Wang
commited 2021-02-03 18:47:37 +08:00
9bf760d127
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
Lorenzo Colitti
commited 2021-02-03 19:04:17 +09:00
31f058e119
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
Lorenzo Colitti
commited 2021-02-03 19:03:53 +09:00
94d03aecfc
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
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-02-03 09:36:09 +00:00
66ab10ca12
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
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-02-03 08:32:55 +00:00
8b1998bfb2
Merge "[NS] Tests : don't expect a score in NF#acceptRequest"
Chalard Jean
authored and
Gerrit Code Review
commited 2021-02-03 08:10:19 +00:00
c6bf15898a
Revert "Refactor setCurrentProxyScriptUrl to a void method"
...
This reverts commit 28fd7803b0
Lorenzo Colitti
commited 2021-02-03 07:25:29 +00:00
5349ba9cfc
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
James Mattis
authored and
Automerger Merge Worker
commited 2021-02-03 05:46:43 +00:00
b68cb3106c
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
James Mattis
authored and
Automerger Merge Worker
commited 2021-02-03 05:19:41 +00:00
24bc30f408
Merge "Adding support for multiple "default" networks"
James Mattis
authored and
Gerrit Code Review
commited 2021-02-03 04:17:47 +00:00
ca0ab687be
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
Jeongik Cha
authored and
Automerger Merge Worker
commited 2021-02-03 03:29:57 +00:00
68d7f63719
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
Jeongik Cha
authored and
Automerger Merge Worker
commited 2021-02-03 02:57:26 +00:00
3de6e9c81e
Merge "Specify version for aidl_interface explicitly"
Jeongik Cha
authored and
Gerrit Code Review
commited 2021-02-03 02:21:26 +00:00
7193b792e6
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
James Mattis
commited 2021-02-02 16:14:36 -08:00
8af2d60519
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
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-02-02 15:34:40 +00:00
ec9bb8cd13
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
Junyu Lai
authored and
Automerger Merge Worker
commited 2021-02-02 15:34:23 +00:00
ca31512d50
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
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-02-02 14:41:24 +00:00
f477bba3c4
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
Junyu Lai
authored and
Automerger Merge Worker
commited 2021-02-02 14:37:47 +00:00
6c21a4dfde
Merge "Update frameworks to use unbundled version of BouncyCastle."
Treehugger Robot
authored and
Gerrit Code Review
commited 2021-02-02 14:37:05 +00:00
9671b7eca8
Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API"
Junyu Lai
authored and
Gerrit Code Review
commited 2021-02-02 13:57:57 +00:00
2c5d744e80
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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-02-02 11:30:18 +00:00
79f031dadc
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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-02-02 10:46:37 +00:00
6964d11672
Merge changes I4f38a539,Id4f6c7f4
...
* changes:
Add the underlying networks to NetworkAgentInfo#toString.
Improve testing for network blocking.
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2021-02-02 10:06:03 +00:00
7b49264237
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
Paul Hu
authored and
Automerger Merge Worker
commited 2021-02-02 09:32:27 +00:00
63fd256cfb
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
Paul Hu
authored and
Automerger Merge Worker
commited 2021-02-02 09:07:11 +00:00
03b2f0dfda
Merge "Remove ArrayUtils usage in connectivity frameworks classes"
Paul Hu
authored and
Gerrit Code Review
commited 2021-02-02 08:47:04 +00:00
e59f31b85a
Add the underlying networks to NetworkAgentInfo#toString.
...
This is useful in debugging VPN networks.
Bug: 173331190
Test: manual
Change-Id: I4f38a53980191a1813c2ef313fedc51af98f18f6
Lorenzo Colitti
commited 2021-02-02 16:17:22 +09:00
b852199e0a
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
Lorenzo Colitti
commited 2021-02-02 16:17:22 +09:00
786947b4ac
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
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-02-02 06:07:13 +00:00
a4adae9feb
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
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-02-02 05:43:12 +00:00
b16235f683
Merge "Have connectivity self-register manager classes"
Treehugger Robot
authored and
Gerrit Code Review
commited 2021-02-02 05:01:04 +00:00
5dea66088e
Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities
...
Both of readArraySet and writeArraySet are hidden APIs inside
Parcel, so reimplement those two methods inside NetworkCapabilities
to prevent calling hidden APIs.
Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I70f75c1a0db92c6a5575c6a9917843d783dfaeea
lucaslin
commited 2021-02-02 12:57:26 +08:00
009c9e6773
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
Lucas Lin
authored and
Automerger Merge Worker
commited 2021-02-02 04:41:36 +00:00
fd33d7f4fe
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
Lucas Lin
authored and
Automerger Merge Worker
commited 2021-02-02 04:18:56 +00:00
89dfaaee8d
Merge "Use function inside NetdUtils instead of NetworkManagementService"
Lucas Lin
authored and
Gerrit Code Review
commited 2021-02-02 03:38:38 +00:00
8ecb705379
[VCN08] Expose NOT_VCN_MANAGED capability as system API
...
Test: m -j doc-comment-check-docs
Fix: 177299683
Bug: 175662146
Change-Id: Iaa53d21774ea48af5fe339b57bf1235c77f295a0
junyulai
commited 2021-02-02 11:34:09 +08:00
ad1760bd6d
Specify version for aidl_interface explicitly
...
Bug: 150578172
Test: m
Change-Id: I4c909903521cd8a766dca5312edd98d17b9e1308
Jeongik Cha
commited 2021-02-02 10:11:31 +09:00
cdd223033d
Merge "[Mainline] Migrate com.google.android.collect pkg" am: 9b3338820a am: cd3b07080b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552881
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica65ce3224b636cf71b69e37ff9f36315e9309f5
Serik Beketayev
authored and
Automerger Merge Worker
commited 2021-02-02 00:31:05 +00:00
223c551196
Merge "[Mainline] Migrate com.google.android.collect pkg" am: 9b3338820a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552881
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1648cf0bc1803d59787edb8715b0abc63728cc5d
Serik Beketayev
authored and
Automerger Merge Worker
commited 2021-02-01 23:50:59 +00:00
cd3b07080b
Merge "[Mainline] Migrate com.google.android.collect pkg"
Serik Beketayev
authored and
Gerrit Code Review
commited 2021-02-01 23:11:56 +00:00
9b3338820a
[NS] Tests : don't expect a score in NF#acceptRequest
...
The score argument is going away, so there no longer
is a need to test it. It's never been used by anybody
and is actually a problem going forward.
Since removing the argument requires a small re-arch
of the testing tool anyway, rebuild expecting requests
on top of TrackRecord. This simplifies the test a
great deal, as well as (as observed in running the
tests) makes the test faster.
Test: this
Change-Id: If03b9e64f14ac8ffa5398b964939a9a45a74b28d
Chalard Jean
commited 2021-02-01 23:06:49 +09:00
efb8409f66
API: Suppress existing NullableCollections lints
...
Bug: 152525509
Bug: 154763999
Test: make checkapi
Change-Id: Iecd0927e6be5496b2fbd1a49396db5439257ffe4
Adrian Roos
commited 2021-02-01 15:04:10 +01:00
14c08d26d5
Merge changes Idcc9e32c,I58769bb7 am: e73a36ba21 am: 203c72f86c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I309434985d7dc6c1cbcb411f6f08ebc4dc5d37d4
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-02-01 12:20:27 +00:00
910fb03907
Merge changes Idcc9e32c,I58769bb7 am: e73a36ba21
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If12227f11585de18d92995cf603765b18f91764f
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-02-01 11:36:03 +00:00
203c72f86c
Merge changes Idcc9e32c,I58769bb7
...
* changes:
Remove getFilteredNetworkState and add @NonNull in NetworkState.
Add test coverage for get*NetworkInfo on metered networks.
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2021-02-01 10:56:19 +00:00
e73a36ba21
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 
Gerrit Code Review
commited 
Chiachang Wang
commited 
Chalard Jean
authored and
James Mattis
authored and
Jeongik Cha
authored and
Treehugger Robot
authored and
Junyu Lai
authored and
Paul Hu
authored and
lucaslin
commited 
Serik Beketayev
authored and
Adrian Roos
commited