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
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
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
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
Lorenzo Colitti
0e920055dc
Add test coverage for get*NetworkInfo on metered networks.
...
Test: test-only change
Change-Id: I58769bb768978d0acff1da6d32c2f6942c43508b
2021-02-01 15:58:12 +09:00
Remi NGUYEN VAN
f172ba283d
Merge "Move module sources to packages/Connectivity" am: 3d70ab73eb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552656
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42989abf6e81a4c0e7bed6b0890a1ee4f2c30191
2021-02-01 06:09:33 +00:00
Remi NGUYEN VAN
8f37b3f55b
Move module sources to packages/Connectivity
...
Files that are planned to be part of the connectivity module are grouped
in packages/Connectivity, so they can be built separately and moved in
one operation with their history into packages/modules/Connectivity.
This places the files in the existing framework-connectivity-sources
filegroup instead of the current framework-core-sources filegroup. Both
are used the same way in framework-non-updatable-sources.
Bug: 171540887
Test: m
Change-Id: I62d9d91574ace6f5c4624035d190260c3126b91e
2021-02-01 11:52:14 +09:00
Junyu Lai
6ab0a5500d
Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API" am: bc1a11fdb2 am: d53184a4de am: bd6e9518e0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556552
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6e5747ccc97972a4c21058c600e72c5a3f3b61e
2021-01-29 23:38:56 +00:00
Junyu Lai
680e2d4f64
Merge "[FUI04] Refactor VpnInfo" am: 149add890e am: ba245e077f am: 55c1a77fea
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icfa9918e41fc3f952a23956108df4db449741364
2021-01-29 23:38:06 +00:00
Junyu Lai
3c48d0cf6f
Merge "[VCN06] Support request background network" am: 2141aec60a am: 336c5d93a7 am: 4d9ef0fc1e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553866
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I50867bc7cb21eb134f20af9ef55c44c2bd8962e9
2021-01-29 23:36:41 +00:00
Junyu Lai
bd6e9518e0
Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API" am: bc1a11fdb2 am: d53184a4de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556552
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifcaddb813f501065921e55b6e8a33269c1f4f95f
2021-01-29 23:22:35 +00:00
Junyu Lai
55c1a77fea
Merge "[FUI04] Refactor VpnInfo" am: 149add890e am: ba245e077f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idee0985fa0feb2c3fd572c66c12a4ee5f0e236e7
2021-01-29 23:21:49 +00:00
Junyu Lai
4d9ef0fc1e
Merge "[VCN06] Support request background network" am: 2141aec60a am: 336c5d93a7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553866
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8c41f6e2eda3b0b690cf6715c58f3bb98de8b1c1
2021-01-29 23:21:03 +00:00
Junyu Lai
d53184a4de
Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API" am: bc1a11fdb2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556552
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d3eb542b1c3a9aabf51c58b8d83ad3e669f2077
2021-01-29 23:04:04 +00:00
Junyu Lai
ba245e077f
Merge "[FUI04] Refactor VpnInfo" am: 149add890e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537211
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I59054bfe1761e28cdfb8e8e6d67e4aabda399adc
2021-01-29 22:55:54 +00:00
Junyu Lai
336c5d93a7
Merge "[VCN06] Support request background network" am: 2141aec60a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553866
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic959a453489767781ebb8fb71effb2c14e0f69d8
2021-01-29 22:46:27 +00:00
Junyu Lai
bc1a11fdb2
Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API"
2021-01-29 17:15:28 +00:00
junyulai
6e74469a64
[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API
...
The wifi (mainline module) need to set the subscriberId for specific
wifi network.
Bug: 176396812
Test: TreeHugger
Change-Id: Ib568ce0c2d1b629e1c20e7ac8d8b78579cf4825c
2021-01-29 22:09:10 +08:00
Junyu Lai
149add890e
Merge "[FUI04] Refactor VpnInfo"
2021-01-29 13:54:53 +00:00
Junyu Lai
2141aec60a
Merge "[VCN06] Support request background network"
2021-01-29 11:02:02 +00:00
junyulai
62d35f7e59
[FUI04] Refactor VpnInfo
...
As a preparation of exposing system API. This patch does some
harmless refactoring, which includes:
1. Change raw arrays into lists according to API guidelines.
2. Write test.
3. Rename class to UnderlyingNetworkInfo.
4. Rename vpnIface to iface.
5. Make underlyingIfaces @NonNull in order to adapt new
unparceling code.
6. implement equals and hashCode for testing.
Test: atest android.net.UnderlyingNetworkInfoTest
Bug: 174123988
Change-Id: I405c21e57c4af8a12a9dd0a1749b9e6690f87045
2021-01-29 17:44:32 +08:00
Junyu Lai
23568a4f04
[VCN06] Support request background network
...
This will be mainly used by VCN management service which will
need to hold the networks but preserve the backgrounded-ness
of the networks.
Test: android.net.ConnectivityManagerTest#testRequestType
Test: android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork /
--rerun-until-failure 100
Test: ConnectivityServiceTest#testBackgroundNetworks
Test: m -j doc-comment-check-docs
Bug: 175662146
Change-Id: I463c7a3139a286e50ea71e674060975ce228caa9
2021-01-29 14:42:32 +08:00
Junyu Lai
8d06e8aba8
Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 00caf89795 am: 227fc5d23d am: f76c711734
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549897
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide501fcf659637c0ec175d3f6f5926c2482734e0
2021-01-28 14:58:38 +00:00
Junyu Lai
f76c711734
Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 00caf89795 am: 227fc5d23d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549897
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia78c1366c0f843bfeadcb16f857a0fc13e2b72cd
2021-01-28 14:15:04 +00:00
Junyu Lai
227fc5d23d
Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 00caf89795
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549897
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I30b0cc54c340150884bebfd289824f1e562eea88
2021-01-28 13:25:50 +00:00
Junyu Lai
00caf89795
Merge "[VCN01] Add NOT_VCN_MANAGED capability"
2021-01-28 13:04:59 +00:00
Treehugger Robot
0658f3f717
[automerger skipped] Merge "Note network interfaces based on transport" am: a7656b2d7e am: 73a7e5b4e9 am: a4f689e36d -s ours
...
am skip reason: Change-Id I4e928fac8a57a9b1fc758a44af2a5719b8c871b8 with SHA-1 4768f6316e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie00f6cdf0545b325d43e8b5491ee182bc6b4035b
2021-01-28 09:57:25 +00:00
Treehugger Robot
a4f689e36d
Merge "Note network interfaces based on transport" am: a7656b2d7e am: 73a7e5b4e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I444343c7230c0f947a666334fb895736fa4bc153
2021-01-28 09:02:21 +00:00
Treehugger Robot
73a7e5b4e9
Merge "Note network interfaces based on transport" am: a7656b2d7e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iae2ae51e3819b37cf2c85ce12715978d6ba68c55
2021-01-28 08:32:23 +00:00
Lorenzo Colitti
29e36cb8c8
Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 83563fd735 am: d892e45c9b am: edd29a2f23
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I21c1c7913987a2bb4d486e6ce8da24a76ddf2dc6
2021-01-28 08:06:46 +00:00
Chiachang Wang
fb61f467cf
Merge "Replace hidden getFileDescriptor$()" am: f13926d8dc am: 6d0e73ed67 am: 72f68cc2f7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553966
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iebc2b32fa7ed14b5326ec7649831fbc8e08b1e9d
2021-01-28 08:06:05 +00:00
Treehugger Robot
b7ac698f9d
Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: a4520fd260 am: 59452b2ad4 am: ac4ababa1b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I14cc8f1f44b09c82ed9d897b904513d3ea49d558
2021-01-28 08:05:36 +00:00
Treehugger Robot
a7656b2d7e
Merge "Note network interfaces based on transport"
2021-01-28 07:45:20 +00:00
Lorenzo Colitti
edd29a2f23
Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 83563fd735 am: d892e45c9b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I174ab03efc5291c58aa2842831ba2cd62381cf43
2021-01-28 07:42:30 +00:00