Remi NGUYEN VAN
e4fa2ac5ac
Merge "Remove ConnectivityServiceTest signature perms use" am: 545f6cf95f am: 4c21d6c2a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727819
Change-Id: I7f2a05be80117dad19b5e7fafb71f562466096f9
2021-06-09 09:15:06 +00:00
Remi NGUYEN VAN
4b6239c2c8
Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119 am: 98ea169c22
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727825
Change-Id: I0fb914110ec6e2c34544831619157f05a8e57661
2021-06-09 09:14:57 +00:00
Remi NGUYEN VAN
4c21d6c2a6
Merge "Remove ConnectivityServiceTest signature perms use" am: 545f6cf95f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727819
Change-Id: Id60ce478abe26c82f79bdce0b025e9629cdd0d89
2021-06-09 08:54:47 +00:00
Remi NGUYEN VAN
98ea169c22
Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727825
Change-Id: Ied36d4711c9c12d0991c00c28a78931ae3ea58f9
2021-06-09 08:54:38 +00:00
Remi NGUYEN VAN
545f6cf95f
Merge "Remove ConnectivityServiceTest signature perms use"
2021-06-09 08:39:33 +00:00
Remi NGUYEN VAN
35e6108119
Merge "Use mockito-extended in FrameworksNetTests"
2021-06-09 08:39:24 +00:00
Junyu Lai
58058998db
[automerger skipped] Merge changes from topic "cts-snapshots" am: 07f97b249c am: fd242c77b1 -s ours
...
am skip reason: Merged-In I90d47ac9bd0570c0aed19402fa9be4e99e0f8621 with SHA-1 056b6649cd is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727822
Change-Id: Iaf7247b1fd065b90ee35858672c263e41b6bd1e7
2021-06-09 08:33:47 +00:00
junyulai
92333ed77f
[automerger skipped] Add CTS for getAllNetworkStateSnapshots am: cfefdea403 am: ccebee1ece -s ours
...
am skip reason: Merged-In I573b009bd05bbc0c855aaa6e20cb8ebde6729936 with SHA-1 3a64e80dee is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708091
Change-Id: I18cb581ff57498561b969fa3c17d126f797dde7f
2021-06-09 08:33:46 +00:00
junyulai
c559f4a4ac
[automerger skipped] Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots am: eaaacb0d47 am: 1c2ffd5329 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730542
Change-Id: I37eb436b3a148cbcca48a41d333f5c8d9b64457f
2021-06-09 08:33:45 +00:00
Lorenzo Colitti
7d9f43c6f3
Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat." am: a3f12dd52c am: b4e1b65298
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727829
Change-Id: Iad96cfcdd5f385c084be76b3b25ffd10b080df7f
2021-06-09 08:33:36 +00:00
Lorenzo Colitti
97adf6a8b4
Merge "Improve test coverage for disconnecting networks with clat." am: f55fa638c8 am: 7e79954915
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729093
Change-Id: Idf372d6f3305d6678837d36ce901af8ac482ea58
2021-06-09 08:33:31 +00:00
Junyu Lai
fd242c77b1
Merge changes from topic "cts-snapshots" am: 07f97b249c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727822
Change-Id: I0fc00956cc8891e45bb2b76f6e35063949d5f0ba
2021-06-09 08:16:01 +00:00
junyulai
ccebee1ece
Add CTS for getAllNetworkStateSnapshots am: cfefdea403
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708091
Change-Id: I8217f4e4c0de2de5f12066e567f56c0f5432d9f7
2021-06-09 08:15:58 +00:00
junyulai
1c2ffd5329
Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots am: eaaacb0d47
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730542
Change-Id: I8f5e007749baa057f1a5a231736d7038fb69204f
2021-06-09 08:15:55 +00:00
Lorenzo Colitti
b4e1b65298
Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat." am: a3f12dd52c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727829
Change-Id: I1e42216dc10552861253f719d1178e3143ac83c3
2021-06-09 08:14:54 +00:00
Lorenzo Colitti
7e79954915
Merge "Improve test coverage for disconnecting networks with clat." am: f55fa638c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729093
Change-Id: Ieb08904445cabf01ed5ba6f4543699a1585fda50
2021-06-09 08:14:44 +00:00
TreeHugger Robot
f216aa9fa7
[automerger skipped] Merge "Fix TetheringTest crash on eng build" into sc-dev am: f15137fb9f -s ours
...
am skip reason: Merged-In I61f6088783d521fd17ae1e87370842b4239fbe75 with SHA-1 7ba566dbf7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14637501
Change-Id: Ia40558871b1ea9ea4ae8ca23501f407c3046589e
2021-06-09 08:13:10 +00:00
Junyu Lai
07f97b249c
Merge changes from topic "cts-snapshots"
...
* changes:
Add CTS for NetworkAgentConfig#setSubscriberId
Add CTS for getAllNetworkStateSnapshots
Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots
2021-06-09 08:09:41 +00:00
Lorenzo Colitti
a3f12dd52c
Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat."
2021-06-09 07:59:25 +00:00
Lorenzo Colitti
f55fa638c8
Merge "Improve test coverage for disconnecting networks with clat."
2021-06-09 07:59:13 +00:00
TreeHugger Robot
f15137fb9f
Merge "Fix TetheringTest crash on eng build" into sc-dev
2021-06-09 07:57:25 +00:00
Treehugger Robot
8c2b394c6f
Merge "Fix restorePrivateDnsSetting with null hostnames" am: 0103375187 am: eea4b37228
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729162
Change-Id: Iacfcb44374664b60f35f48749100dae83c54dfaf
2021-06-09 06:18:23 +00:00
Treehugger Robot
eea4b37228
Merge "Fix restorePrivateDnsSetting with null hostnames" am: 0103375187
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729162
Change-Id: I604e6d94640f36b37a628aa77e6df0fb709e2d85
2021-06-09 06:06:13 +00:00
Treehugger Robot
0103375187
Merge "Fix restorePrivateDnsSetting with null hostnames"
2021-06-09 05:45:24 +00:00
Remi NGUYEN VAN
d7426b8a44
[automerger skipped] Merge changes from topic "conn_test_defaults_cp" am: de3c20ecb5 am: 99fadb7b70 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729164
Change-Id: I6b3f89ee35fcf5ecaa11fbb3d8fe644b87ede58d
2021-06-09 01:58:35 +00:00
Remi NGUYEN VAN
5a9c5a1259
[automerger skipped] Add framework-connectivity-test-defaults am: 3912c80e99 am: 0dcbcff1d6 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729165
Change-Id: I35208538034f9aaae619ca20a265be4033b15c02
2021-06-09 01:58:33 +00:00
Junyu Lai
127bb8eed0
[automerger skipped] Merge changes from topics "enable-policy-ranking", "sendNetworkScore" am: 5b15e700bb am: 9575dbbb81 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1726731
Change-Id: I93d9de97236854622f8d9d8b19cd4a76d338d860
2021-06-09 01:58:17 +00:00
Chalard Jean
176f330542
[automerger skipped] Enable policy ranking am: f4c48a4d5f am: 50c26d75f0 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727818
Change-Id: Ie59f244a3d88a3276081786c690671564ea936a9
2021-06-09 01:58:16 +00:00
junyulai
199214a96c
[automerger skipped] Add CTS to verify NetworkAgent#setLingerDuration am: a95eef727e am: 682ab81490 -s ours
...
am skip reason: Merged-In I77818685b2bfea499c0294874d205544161677c5 with SHA-1 cfb2af8659 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1654011
Change-Id: I2b20fecede80e2a06800976ef9f0f883270846db
2021-06-09 01:58:14 +00:00
Chalard Jean
b2d9e1a31f
[automerger skipped] Allow network providers to set the linger duration. am: 550b5214d3 am: d413b74023 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727821
Change-Id: I87b6b015e5b3e6a85750ea96d484b1a2ff967c7e
2021-06-09 01:58:12 +00:00
junyulai
c0aede8464
[automerger skipped] Fix nascent timer never get removed am: 36c02987c6 am: 602d75b22b -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727820
Change-Id: Id4d65b0c15eae6743d5145853a54213ae8350c10
2021-06-09 01:58:10 +00:00
Chalard Jean
cc57bdb6e3
[automerger skipped] [NS13] Remove the last usage of the legacy int am: c81d4c3c7e am: 6a529e1a7a -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727817
Change-Id: Id4ce0624774bd723a62a1399f7f2d10983b659f1
2021-06-09 01:58:08 +00:00
Chalard Jean
31e4a2f85d
[automerger skipped] Add documentation am: d89e56da6b am: 435354afe6 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727816
Change-Id: I791f3396d67ea2b29ea2ce364bf58bcda22330f8
2021-06-09 01:58:07 +00:00
Chalard Jean
047ed657f1
[automerger skipped] Use filter from CollectionUtils. am: 5e8f8431d8 am: b0b3e93682 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727815
Change-Id: I97eab06f99f08fcd94e1dd3d1e129d507816b831
2021-06-09 01:58:04 +00:00
Chalard Jean
4869fab025
[automerger skipped] Fix a bug where updates of offers won't find existing offers am: 9f6d447a42 am: 605a2a6fcb -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727814
Change-Id: I01f2656025ce1886e3027aee2fb91078e17cb20d
2021-06-09 01:58:03 +00:00
Chalard Jean
133e8bd3ba
[automerger skipped] [NS12] Address comments on NS09 am: 29cb06a3e0 am: d39f2dbd78 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727813
Change-Id: Ia933c01dd0870060e3a9004847675f2fa0b26a5d
2021-06-09 01:58:01 +00:00
Chalard Jean
cb4d3f43ef
[automerger skipped] [NS11] Fix yieldToBadWifi over the policy scoring am: 142f0fe4d4 am: 22acfab1bc -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727812
Change-Id: I06f8e5f01b8b55a2f8263106c764a1e0870b8141
2021-06-09 01:57:59 +00:00
Chalard Jean
62e1a5928a
[automerger skipped] Add doc for NetworkScore#getLegacyInt am: 0422927cd8 am: fd5d21d50e -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727811
Change-Id: I122847f7fff3f461c2bdef8443eaa87fdac2a105
2021-06-09 01:57:58 +00:00
Chalard Jean
de1d74c132
[automerger skipped] Expose sendNetworkScore that takes a NetworkScore am: 536a5bac26 am: ecaa23f8e0 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1726730
Change-Id: Ieb09251372fa335f779a4e65a6e2d15b80fa23a4
2021-06-09 01:57:56 +00:00
junyulai
9c5d40beca
Fix TetheringTest crash on eng build
...
startTrackDefaultNetwork was allowed to called multiple times
before even though there is no one actually do it. However,
in the TetheringTest#verifyDefaultNetworkRequestFiled, a
manual invocation is used to ensure that function supports
multiple entrance.
But with aosp/1697371, startTrackDefaultNetwork is no longer
allowed to be called multiple times, it would lead to log.wtf
and crash system in eng build.
Since the manual invocation of startTrackDefaultNetwork is not
realistic and no longer valid anymore, remove the invocation
that caused the trouble.
Test: atest TetheringCoverageTests
Bug: 188613493
Merged-In: I61f6088783d521fd17ae1e87370842b4239fbe75
Change-Id: I61f6088783d521fd17ae1e87370842b4239fbe75
(cherry-picked from aosp/1711433)
2021-06-09 01:57:37 +00:00
Yan Yan
64828e9ff3
Merge changes I00d1aa47,Icffbe67f am: 77f2e95515 am: 4d50a5f097
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1690132
Change-Id: Ie5bc0407bcf43d5186cde53599bd4318b3c4be25
2021-06-09 01:57:25 +00:00
junyulai
cfefdea403
Add CTS for getAllNetworkStateSnapshots
...
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testGetAllNetworkStateSnapshots --rerun-until-failure 100
Test: atest
CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest on R
device
Bug: 188140631
Merged-In: I573b009bd05bbc0c855aaa6e20cb8ebde6729936
Change-Id: I573b009bd05bbc0c855aaa6e20cb8ebde6729936
(cherry-picked from ag/14598438)
2021-06-09 01:34:14 +00:00
junyulai
eaaacb0d47
Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots
...
This is declared in the API surface, but the implementation
does not match.
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testGetAllNetworkStateSnapshots
Bug: 188140631
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I97aa69651461ebe5c323ec669372f9a61b84e6a6
Change-Id: I97aa69651461ebe5c323ec669372f9a61b84e6a6
(cherry-picked from ag/14601670)
2021-06-09 01:34:14 +00:00
Junyu Lai
ed4ef7bb99
Add CTS for NetworkAgentConfig#setSubscriberId
...
Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkAgentTest
on R device
Bug: 188140631
Merged-In: I90d47ac9bd0570c0aed19402fa9be4e99e0f8621
Change-Id: I90d47ac9bd0570c0aed19402fa9be4e99e0f8621
(cherry-picked from ag/14639705)
2021-06-09 01:34:14 +00:00
Remi NGUYEN VAN
99fadb7b70
Merge changes from topic "conn_test_defaults_cp" am: de3c20ecb5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729164
Change-Id: I0a14a5fc335b46a5fd61c126e3107898253d097f
2021-06-09 01:20:24 +00:00
Remi NGUYEN VAN
0dcbcff1d6
Add framework-connectivity-test-defaults am: 3912c80e99
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729165
Change-Id: Id17a3ba31f955f4533731cbc3dda23d07c06bb0b
2021-06-09 01:20:17 +00:00
Remi NGUYEN VAN
de3c20ecb5
Merge changes from topic "conn_test_defaults_cp"
...
* changes:
Move connectivity test defaults to tests/common
Add framework-connectivity-test-defaults
2021-06-09 00:59:17 +00:00
Junyu Lai
9575dbbb81
Merge changes from topics "enable-policy-ranking", "sendNetworkScore" am: 5b15e700bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1726731
Change-Id: I0f4598c353cb7dba7f0583a3103481d298e45b5c
2021-06-08 23:10:17 +00:00
Chalard Jean
50c26d75f0
Enable policy ranking am: f4c48a4d5f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727818
Change-Id: I458b430aac9d633099787863bcc252ffd236725a
2021-06-08 23:10:14 +00:00
junyulai
682ab81490
Add CTS to verify NetworkAgent#setLingerDuration am: a95eef727e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1654011
Change-Id: I257454c0429cf454ef23617ad39ef1a9711fd44a
2021-06-08 23:10:11 +00:00