Treehugger Robot
ff5480575e
Merge "Remove Slog usage in NetworkState" am: 437ee783c4 am: 15516e3f0b am: fc8d0f981f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0345579ab38ffd06dc548d7c268f1e2dff2c7b9d
2021-03-12 06:13:59 +00:00
Remi NGUYEN VAN
6ce9aa2d49
Merge "Move ParseException to Connectivity" am: eae251b42a am: 160a29cad8 am: 6a30b70575
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626205
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba0c91e109d04be28dca01c1997e74c06f12f60f
2021-03-12 06:13:12 +00:00
Treehugger Robot
fc8d0f981f
Merge "Remove Slog usage in NetworkState" am: 437ee783c4 am: 15516e3f0b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I14f13eefd5a1649df8eb3b3f77bfda45997b26de
2021-03-12 05:32:55 +00:00
Remi NGUYEN VAN
6a30b70575
Merge "Move ParseException to Connectivity" am: eae251b42a am: 160a29cad8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626205
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb5674e812f2a2f2a6a1e23aa46a2d8f208099f5
2021-03-12 05:32:43 +00:00
Treehugger Robot
15516e3f0b
Merge "Remove Slog usage in NetworkState" am: 437ee783c4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e01b140db4d44de081ba4d87cca63578271500e
2021-03-12 05:15:42 +00:00
Remi NGUYEN VAN
160a29cad8
Merge "Move ParseException to Connectivity" am: eae251b42a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626205
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06ac628c283c0a59a756fb5d6e94afb5aef949dd
2021-03-12 05:12:33 +00:00
Treehugger Robot
437ee783c4
Merge "Remove Slog usage in NetworkState"
2021-03-12 05:12:26 +00:00
Lucas Lin
3f6f8215c3
Merge changes Ib80f814f,Ic605e489 am: 3bde652e41 am: 3912538c41 am: 9038eeece3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47862eeec4f74a0901b8b866dd6ffa906bd9e62f
2021-03-12 04:58:40 +00:00
Frank Li
cb7b1a6643
Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" am: ab31bd8c31 am: 22f91bdbca am: ac99b3fd18
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6192035f3be707c6f840b373579d2666ca5c3ac6
2021-03-12 04:58:20 +00:00
Lucas Lin
9038eeece3
Merge changes Ib80f814f,Ic605e489 am: 3bde652e41 am: 3912538c41
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f41a9cd27dd37c859e69fe02a32b9ab13fb0d46
2021-03-12 04:34:22 +00:00
Frank Li
ac99b3fd18
Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" am: ab31bd8c31 am: 22f91bdbca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic6aa11902b9ade040bee702650722edfd65b9113
2021-03-12 04:34:11 +00:00
Remi NGUYEN VAN
eae251b42a
Merge "Move ParseException to Connectivity"
2021-03-12 04:27:55 +00:00
Lucas Lin
3912538c41
Merge changes Ib80f814f,Ic605e489 am: 3bde652e41
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I94fd187e5f2cc0428807668f82b3a29ad8b66c47
2021-03-12 03:56:18 +00:00
Frank Li
22f91bdbca
Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" am: ab31bd8c31
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9096f951a18b1ffe96efa1d48207dac644d4e92c
2021-03-12 03:52:27 +00:00
Lucas Lin
3bde652e41
Merge changes Ib80f814f,Ic605e489
...
* changes:
Use new API - getIpSecNetIdRange() in IpSecService
Add a new API to get the network ID range of IPSec tunnel interface
2021-03-12 03:30:32 +00:00
Frank Li
ab31bd8c31
Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService"
2021-03-12 02:45:30 +00:00
Remi NGUYEN VAN
f98e84932b
Merge "Create ServiceConnectivityResources" into sc-dev
2021-03-12 02:10:20 +00:00
Remi NGUYEN VAN
263b8cf452
[automerger skipped] Merge changes from topic "ethernet_specifier" am: 92e9f17915 am: 7af6af880c am: d4232ce11a -s ours
...
am skip reason: Change-Id Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989 with SHA-1 5babd4ec15 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0133b6f49eac269c5704e5a1dbdfecc85507ae32
2021-03-12 00:52:26 +00:00
Remi NGUYEN VAN
7a3dbfcc49
[automerger skipped] Add Ethernet, TestNetworkSpecifier API am: 7f11b46a43 am: f680bb763a am: f9799d63a4 -s ours
...
am skip reason: Change-Id Iee569f5c8bbdc4bc979610e1191308281f3d4620 with SHA-1 6697878c6b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4f60a26f8c19e77d348dfcc7c382022ba6cf0d1
2021-03-12 00:52:15 +00:00
Treehugger Robot
5237f54a95
Merge changes Iac9487e8,Ifa411c7b am: 999506022f am: 007256389e am: 431f25a9da
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1b3f0447705f910467a52d2504ba1aaef850a80
2021-03-12 00:49:24 +00:00
Remi NGUYEN VAN
d4232ce11a
Merge changes from topic "ethernet_specifier" am: 92e9f17915 am: 7af6af880c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I772ca29f64cb9431a899a2c213c511ad467fc36f
2021-03-12 00:26:49 +00:00
Remi NGUYEN VAN
f9799d63a4
Add Ethernet, TestNetworkSpecifier API am: 7f11b46a43 am: f680bb763a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I63159846579c43c721eeb86c9a55faa3f2888be8
2021-03-12 00:26:45 +00:00
Remi NGUYEN VAN
7af6af880c
Merge changes from topic "ethernet_specifier" am: 92e9f17915
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9ef1a287439b5f5705ff3b3b4de4ded54f61c1c1
2021-03-12 00:12:52 +00:00
Remi NGUYEN VAN
f680bb763a
Add Ethernet, TestNetworkSpecifier API am: 7f11b46a43
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a1b38fb6b8b6831bac016a8352ae9073758f9af
2021-03-12 00:10:08 +00:00
Treehugger Robot
431f25a9da
Merge changes Iac9487e8,Ifa411c7b am: 999506022f am: 007256389e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0742b4bb3c5b2ddaa06830b403d849ed25ef71cd
2021-03-12 00:04:56 +00:00
Remi NGUYEN VAN
92e9f17915
Merge changes from topic "ethernet_specifier"
...
* changes:
Fix common tests on Q and R
Add Ethernet, TestNetworkSpecifier API
2021-03-11 23:51:49 +00:00
Treehugger Robot
007256389e
Merge changes Iac9487e8,Ifa411c7b am: 999506022f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2cf126259f903d407830b1e8bc2d3fcdc02b97c2
2021-03-11 23:15:17 +00:00
lucaslin
1a6095c4cf
Add a new API to get the network ID range of IPSec tunnel interface
...
- Add a new API to get the network ID range of IPSec tunnel
interface.
- Use the new API in IpSecServiceTest to make sure the result is
the same. Follow-up commit will change the logic in
IpSecService#reserveNetId(), the modified test can ensure the
correctness of the new change.
Bug: 172183305
Test: atest FrameworksNetTests:IpSecServiceTest
Change-Id: Ic605e48941fc9d6482cdcd01a8adcdc9b6d586a6
2021-03-12 00:46:33 +08:00
Remi NGUYEN VAN
7f11b46a43
Add Ethernet, TestNetworkSpecifier API
...
Rename StringNetworkSpecifier to EthernetNetworkSpecifier (its only
production user), and make it module-lib API.
The original StringNetworkSpecifier file is actually kept to satisfy
some invalid dependencies; it will be removed separately.
This allows specifying an Ethernet interface with a non-deprecated API:
until this change the only way to do so would be to use
NetworkRequest#setSpecifier(String), which is deprecated.
Similarly, add the TestNetworkSpecifier API for TestNetworkManager, to
replace previous usage of StringNetworkSpecifier. TestNetworkManager is
module API, so TestNetworkSpecifier should be module API too. This
allows tests to request the test interface specifically, without using
the deprecated NetworkRequest#setSpecifier(String).
Bug: 179329291
Test: m
Merged-In: Iee569f5c8bbdc4bc979610e1191308281f3d4620
Change-Id: Iee569f5c8bbdc4bc979610e1191308281f3d4620
2021-03-11 23:02:02 +08:00
Remi NGUYEN VAN
5a6212753b
Fix common tests on Q and R
...
The common tests cannot reference EthernetNetworkSpecifier,
as it did not exist in Q and R yet.
Bug: 179329291
Merged-In: Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989
Change-Id: Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989
Test: atest CtsNetTestCasesLatestSdk
2021-03-11 23:02:02 +08:00
junyulai
f4bc12fe28
[VCN11] Make requestBackgroundNetwork requires handler
...
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest
Bug: 175662146
Change-Id: Iac9487e8de8bfdd87fc7a0153b228ae2a7ba4e19
2021-03-11 21:05:27 +08:00
junyulai
6b0a6a22a3
[VCN10] Add new API to listen for highest score network
...
Test: atest ConnectivityServiceTest#testRegisterBestMatchingNetworkCallback
Bug: 175662146
Change-Id: Ifa411c7b53da789c74fff7e1a95f9c9ebf5bd05c
2021-03-11 21:04:06 +08:00
Lorenzo Colitti
f9dc7cb085
Merge "Don't start clatd if disabled by vendor property." am: 91fccfe42f am: 6abc4bec40 am: 5d6c73b585
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6989361f1dae72cb94d6e6cf6144ae61cb80c328
2021-03-11 13:02:29 +00:00
Lorenzo Colitti
5d6c73b585
Merge "Don't start clatd if disabled by vendor property." am: 91fccfe42f am: 6abc4bec40
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I333fba0c9bca40f0cd60d042b4c6ed82e72abaa9
2021-03-11 12:55:46 +00:00
Lorenzo Colitti
6abc4bec40
Merge "Don't start clatd if disabled by vendor property." am: 91fccfe42f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e468f41424104a5e1d757e18bc5a8648c7f6d1d
2021-03-11 12:34:57 +00:00
Lorenzo Colitti
91fccfe42f
Merge "Don't start clatd if disabled by vendor property."
2021-03-11 12:22:34 +00:00
Remi NGUYEN VAN
16e9dd5b4f
Remove Slog usage in NetworkState
...
Slog should not be used in unbundled jars as it is a hidden API; use the
standard Log utility instead.
Bug: 172050541
Test: m
Change-Id: I54b2b99b2aedbb5194e9ec24068d2f2ce46d67fc
2021-03-11 21:01:30 +09:00
Lorenzo Colitti
5896890ede
Merge "Unbreak extraInfo values returned to apps." am: 877ef7634f am: a035f85997 am: 61aec97dc9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624040
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5e50ac962959387ec42ee644376e1c10df0dc677
2021-03-11 10:09:42 +00:00
lifr
1c0d9b29ff
[CS17]Remove useless code(AsyncChannel) from ConnectivityService
...
The caller of AsyncChannel has been deleted in the last commit
(Remove legacy network factories), so the useless code of
AsyncChannel should also be deleted.
Bug: 170917042
Test: atest FrameworksNetTests
Change-Id: I6ce164fe5e3d592f1ed63753e8d3c0086bf61fa2
2021-03-11 09:57:41 +00:00
Lorenzo Colitti
61aec97dc9
Merge "Unbreak extraInfo values returned to apps." am: 877ef7634f am: a035f85997
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624040
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I99ea36c50a38dfc54b69ec5ad46d11d50e458925
2021-03-11 09:25:48 +00:00
Lorenzo Colitti
a035f85997
Merge "Unbreak extraInfo values returned to apps." am: 877ef7634f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624040
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib6560b94331f477cd7ea9df3c8f766b1eec49dfa
2021-03-11 08:26:47 +00:00
Remi NGUYEN VAN
04e1000ef5
Move ParseException to Connectivity
...
ParseException is a public API class used to support Connectivity APIs,
so it should be in the same API surface as connectivity.
Bug: 181512874
Test: m
Change-Id: Ie1213de0d0facc8f409f7b4c2553abb382e4afbf
2021-03-11 17:19:18 +09:00
Lorenzo Colitti
877ef7634f
Merge "Unbreak extraInfo values returned to apps."
2021-03-11 08:06:03 +00:00
Lorenzo Colitti
35432c1375
Merge "Set extraInfo on cellular TestNetworkAgents." am: ab2f3d3cb5 am: c612271990 am: 3732b76a96
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624039
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41e016fa2cf4907905e3c4f9ab4dbc3d7c0ad418
2021-03-11 05:17:45 +00:00
Remi NGUYEN VAN
38f69a581d
Merge "Fix common tests on Q and R" into sc-dev
2021-03-11 05:17:03 +00:00
Lorenzo Colitti
3732b76a96
Merge "Set extraInfo on cellular TestNetworkAgents." am: ab2f3d3cb5 am: c612271990
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624039
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id194278af5a07dea4d0641c0884c46e77c931938
2021-03-11 04:33:28 +00:00
Lorenzo Colitti
c612271990
Merge "Set extraInfo on cellular TestNetworkAgents." am: ab2f3d3cb5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624039
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I66af2cf6b6cd286993fa3328c5cc52d8bba3beb9
2021-03-11 03:57:11 +00:00
Lorenzo Colitti
ab2f3d3cb5
Merge "Set extraInfo on cellular TestNetworkAgents."
2021-03-11 03:31:49 +00:00
Aaron Huang
0c39920728
Merge "Remove IBatteryStats from ConnectivityService module" am: f3827cf444 am: 433b9738b3 am: a100290e51
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623262
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I58a89eee64c57fbf04e21ee0996eff435584f709
2021-03-11 03:08:13 +00:00
Chiachang Wang
00560289cb
Merge "Remove hidden APIs usage regarding to dump" am: f4956c7502 am: 9ffb4d5e8b am: 622c64b409
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622625
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I307d1c58558b08f7111aab91ed877937761b68a4
2021-03-11 03:05:52 +00:00