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
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
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
Chiachang Wang
72f68cc2f7
Merge "Replace hidden getFileDescriptor$()" am: f13926d8dc am: 6d0e73ed67
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553966
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id15d49eb46923d3d5c0433babeceea9fec21386c
2021-01-28 07:32:11 +00:00
Treehugger Robot
ac4ababa1b
Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: a4520fd260 am: 59452b2ad4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie90c6d0245703243f66a9bc2e4d0bf512b3e6339
2021-01-28 07:31:49 +00:00
Lorenzo Colitti
d892e45c9b
Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 83563fd735
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I385f93ef5fc3a627fcc2ae827c72e0785c464d8f
2021-01-28 07:22:25 +00:00
Chiachang Wang
6d0e73ed67
Merge "Replace hidden getFileDescriptor$()" am: f13926d8dc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553966
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib6f87447485fd0a4ee008bcabea80b4827fdd99b
2021-01-28 07:15:15 +00:00
Lorenzo Colitti
83563fd735
Merge "Fix legacy APIs when VPN switches to suspended underlying network."
2021-01-28 07:07:37 +00:00
Treehugger Robot
59452b2ad4
Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: a4520fd260
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9ae1d067d23fb87d97f326f6da29ddf3a022a821
2021-01-28 07:04:48 +00:00
Chiachang Wang
f13926d8dc
Merge "Replace hidden getFileDescriptor$()"
2021-01-28 06:36:11 +00:00
Remi NGUYEN VAN
afd7560b29
Note network interfaces based on transport
...
Instead of classifying interfaces by network type in BatteryStats,
classify them based on the transports array provided by the
NetworkAgent.
Network types are deprecated and transports should be used instead. This
change allows BatteryStats to stop depending on unstable APIs such as
isNetworkTypeMobile.
This change also updates nullability annotations in ConnectivityService
and NetworkAgentInfo to show that the NetworkCapabilities are non-null
(as provided by the network agent) when calling
noteNetworkInterfaceTransports.
Bug: 174436414
Test: atest
atest ConnectivityServiceTest#testBatteryStatsNetworkType \
--rerun-until-failure 40
Merged-In: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8
Change-Id: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8
2021-01-28 15:10:54 +09:00
Treehugger Robot
a4520fd260
Merge "[Mainline] Migrate TextUtils#emptyIfNull"
2021-01-28 06:05:08 +00:00
TreeHugger Robot
359e963945
Merge "Revert "Revert "Note network interfaces based on transport""" into sc-dev
2021-01-28 05:55:23 +00:00
Lucas Lin
6225d58df6
Merge "Use createStringArray instead of readStringArray" am: d1a04ba095 am: a9090b57cf am: da20373654
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I743f07815b4d2d112d0f8bbeb9d313f6f3d3a8e0
2021-01-28 05:33:07 +00:00
Lucas Lin
19a324e9bd
Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: d15fcc3048 am: b96b07febe am: 0c2e799c80
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1f7bafc63926c7c68c7c3cdd13069234487888fa
2021-01-28 05:32:36 +00:00
Lucas Lin
da20373654
Merge "Use createStringArray instead of readStringArray" am: d1a04ba095 am: a9090b57cf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1631856cb2324f5295f834ce8ff2f6276d15a759
2021-01-28 05:01:27 +00:00
Lucas Lin
0c2e799c80
Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: d15fcc3048 am: b96b07febe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I061c38c83eedf9235d85c4353e88b72117d93b86
2021-01-28 05:01:00 +00:00
Lucas Lin
a9090b57cf
Merge "Use createStringArray instead of readStringArray" am: d1a04ba095
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I38445a56180675c48055fc4256ea238c2b86fabe
2021-01-28 04:31:18 +00:00
Lucas Lin
b96b07febe
Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: d15fcc3048
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd01df52928e13717eae903c49e201f7bf39940e
2021-01-28 04:28:10 +00:00
Lucas Lin
d1a04ba095
Merge "Use createStringArray instead of readStringArray"
2021-01-28 04:04:10 +00:00
lucaslin
cee4354c1d
Use createStringArray instead of readStringArray
...
To prevent ProxyInfo calling hidden API, use public one -
Parcel#createStringArray() instead.
Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I1a5376872d743e1863982bb95d579aeba7159d33
2021-01-28 04:03:59 +00:00
Lucas Lin
d15fcc3048
Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier"
2021-01-28 04:01:49 +00:00