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
junyulai
ad1760bd6d
[VCN08] Expose NOT_VCN_MANAGED capability as system API
...
Test: m -j doc-comment-check-docs
Fix: 177299683
Bug: 175662146
Change-Id: Iaa53d21774ea48af5fe339b57bf1235c77f295a0
2021-02-02 11:34:09 +08:00
Serik Beketayev
2c294e786d
Merge "[Mainline] Migrate com.google.android.collect pkg" am: 9b3338820a am: cd3b07080b am: 223c551196
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552881
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7aa42de207124ca9e8646324cd4b57834c341ad6
2021-02-02 01:27:24 +00:00
Jeongik Cha
cdd223033d
Specify version for aidl_interface explicitly
...
Bug: 150578172
Test: m
Change-Id: I4c909903521cd8a766dca5312edd98d17b9e1308
2021-02-02 10:11:31 +09:00
Serik Beketayev
223c551196
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
2021-02-02 00:31:05 +00:00
Serik Beketayev
cd3b07080b
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
2021-02-01 23:50:59 +00:00
Serik Beketayev
9b3338820a
Merge "[Mainline] Migrate com.google.android.collect pkg"
2021-02-01 23:11:56 +00:00
Lorenzo Colitti
ec960a86ce
Merge changes Idcc9e32c,I58769bb7 am: e73a36ba21 am: 203c72f86c am: 910fb03907
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d15c00910467d51531a25c025efb491b446b6a4
2021-02-01 12:41:24 +00:00
Lorenzo Colitti
910fb03907
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
2021-02-01 12:20:27 +00:00
Lorenzo Colitti
203c72f86c
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
2021-02-01 11:36:03 +00:00
Remi NGUYEN VAN
a8780c8ea1
resolve merge conflicts of bff19645ef to sc-dev
...
Bug: None, merge conflict
Change-Id: Id07440d6a55111a1a7ddbf3df306f4466073fd1d
2021-02-01 11:29:28 +00:00
Lorenzo Colitti
e73a36ba21
Merge changes Idcc9e32c,I58769bb7
...
* changes:
Remove getFilteredNetworkState and add @NonNull in NetworkState.
Add test coverage for get*NetworkInfo on metered networks.
2021-02-01 10:56:19 +00:00
Remi NGUYEN VAN
bff19645ef
Merge "Move module sources to packages/Connectivity" am: 3d70ab73eb am: f172ba283d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552656
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8261b01b976b4d8009cd028fa113ef8bede74acb
2021-02-01 08:41:56 +00:00
paulhu
4797107480
Remove ArrayUtils usage in connectivity frameworks classes
...
Instead, use CollectionUtils from frameworks/libs/net.
Bug: 174541037
Test: atest FrameworksNetTests
Change-Id: I610e00302cf76510e9e34ac8a9a5f738e5ecd0c7
2021-02-01 16:30:08 +08:00
Remi NGUYEN VAN
fe97b48b6e
Have connectivity self-register manager classes
...
As connectivity services are planned to move to a separate module, move
the manager classes registration from SystemServiceRegistry to
ConnectivityServicesRegistrar, using the registerContextAwareService
APIs.
This follows patterns and naming in WifiFrameworkInitializer.
Bug: 171540887
Test: device boots, connectivity working
Change-Id: I62ced1275750c73f209bac8ec3a3204b95695b83
2021-02-01 17:10:39 +09:00
Lorenzo Colitti
6f55e61287
Remove getFilteredNetworkState and add @NonNull in NetworkState.
...
getFilteredNetworkState is only used in two places, both of which
use only small parts of the NetworkState that is returned to
them. Remove the method and replace it with inline code in the
two callers. NetworkState is a fairly expensive object, and this
removes the need to perform lots of defensive copies of data that
the caller does not need.
Also remove the only call to the NetworkState constructor in
ConnectivityService. That leaves only one caller to the
NetworkState constructor, the one in NetworkAgentInfo. This
constructor is called with defensive copies of NetworkInfo,
LinkProperties, and NetworkCapabilities, so mark these three
parameters as @NonNull. It's also called with a non-null
Network, because NetworkAgentInfo is only constructed with
non-null Networks, so mark the network parameter @NonNull as
well.
In order to make the arguments in the NetworkState constructor
@NonNull, introduce a new constructor that sets everything to
null and make NetworkState.EMPTY call it.
Test: atest FrameworksNetTests
Change-Id: Idcc9e32c53533b0cf61494517e62d4c184fa7610
2021-02-01 16:12:04 +09:00