TreeHugger Robot
1c3c0583ee
[automerger skipped] Merge "Fix TetheringTest crash on eng build" into sc-dev am: f15137fb9f -s ours am: f216aa9fa7 -s ours
...
am skip reason: Merged-In I61f6088783d521fd17ae1e87370842b4239fbe75 with SHA-1 9c5d40beca is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14637501
Change-Id: I9a5557bf521da860b4823e4bfeca5dc83f838d7a
2021-06-09 08:34:13 +00:00
TreeHugger Robot
f19e216465
[automerger skipped] Merge "Fix TetheringTest crash on eng build" into sc-dev am: f15137fb9f am: 04453f641a -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: Ib913395e0771bc1b708f6ba1409744eb6e75bdd3
2021-06-09 08:33:12 +00:00
TreeHugger Robot
04453f641a
Merge "Fix TetheringTest crash on eng build" into sc-dev am: f15137fb9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14637501
Change-Id: I8cd2c8a60e72f28aaf3b931ad7701263d8fd9b29
2021-06-09 08:14:54 +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
TreeHugger Robot
f15137fb9f
Merge "Fix TetheringTest crash on eng build" into sc-dev
2021-06-09 07:57:25 +00:00
Treehugger Robot
4d857e173c
Merge "Fix restorePrivateDnsSetting with null hostnames" am: 0103375187 am: eea4b37228 am: 8c2b394c6f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729162
Change-Id: Id2f5783456b677af441eb73555fba932035d69f3
2021-06-09 06:38:54 +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
31861dd54b
[automerger skipped] Merge changes from topic "conn_test_defaults_cp" am: de3c20ecb5 am: 99fadb7b70 -s ours am: d7426b8a44 -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: I494a76b6ae1d3b101ad9668b177c651d093797de
2021-06-09 02:15:25 +00:00
Remi NGUYEN VAN
3a759d2df1
[automerger skipped] Add framework-connectivity-test-defaults am: 3912c80e99 am: 0dcbcff1d6 -s ours am: 5a9c5a1259 -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: I626385f53d58115374831534b346443a7068e7d8
2021-06-09 02:15:23 +00:00
Junyu Lai
b35932baa1
[automerger skipped] Merge changes from topics "enable-policy-ranking", "sendNetworkScore" am: 5b15e700bb am: 9575dbbb81 -s ours am: 127bb8eed0 -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: I4281cc429d0370588e8846f5bdb2559a28b8b0de
2021-06-09 02:15:01 +00:00
Chalard Jean
ad3e8abd5d
[automerger skipped] Enable policy ranking am: f4c48a4d5f am: 50c26d75f0 -s ours am: 176f330542 -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: I90d2c4ebab059175fc47ec13bd51a25a0fe72b8f
2021-06-09 02:14:59 +00:00
junyulai
e597b54010
[automerger skipped] Add CTS to verify NetworkAgent#setLingerDuration am: a95eef727e am: 682ab81490 -s ours am: 199214a96c -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: Ib69e7587e8ee99b307412cd90d032c49eabfa8e7
2021-06-09 02:14:57 +00:00
Chalard Jean
a2267b913b
[automerger skipped] Allow network providers to set the linger duration. am: 550b5214d3 am: d413b74023 -s ours am: b2d9e1a31f -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: Ib4e8c3b0534104b6cb068a0e7362da44f5218e6c
2021-06-09 02:14:55 +00:00
junyulai
672d1b388e
[automerger skipped] Fix nascent timer never get removed am: 36c02987c6 am: 602d75b22b -s ours am: c0aede8464 -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: I80c0d47c38527d7a2bd0f975cc6eddfe8d4e20dd
2021-06-09 02:14:53 +00:00
Chalard Jean
181b89c7ad
[automerger skipped] [NS13] Remove the last usage of the legacy int am: c81d4c3c7e am: 6a529e1a7a -s ours am: cc57bdb6e3 -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: I69f5710fb0fddc9a6c9825e6c7fad58e9e4b1a89
2021-06-09 02:14:50 +00:00
Chalard Jean
d45334e49d
[automerger skipped] Add documentation am: d89e56da6b am: 435354afe6 -s ours am: 31e4a2f85d -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: I256c3169e47d0d6e41a10e2fe44645c84e4444a3
2021-06-09 02:14:48 +00:00
Chalard Jean
92252f5b21
[automerger skipped] Use filter from CollectionUtils. am: 5e8f8431d8 am: b0b3e93682 -s ours am: 047ed657f1 -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: Ibae3db073f86d3a1eb07ed6b0dbc6c69bfc23b97
2021-06-09 02:14:46 +00:00
Chalard Jean
7326949bab
[automerger skipped] Fix a bug where updates of offers won't find existing offers am: 9f6d447a42 am: 605a2a6fcb -s ours am: 4869fab025 -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: Ief3be6f7be121fab0a84b4690d8304d0d9477883
2021-06-09 02:14:44 +00:00
Chalard Jean
bf9954f4e4
[automerger skipped] [NS12] Address comments on NS09 am: 29cb06a3e0 am: d39f2dbd78 -s ours am: 133e8bd3ba -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: Ic9e20ff58104cc140973fad0e84f5b15f4868373
2021-06-09 02:14:41 +00:00
Chalard Jean
31d8f6e1a1
[automerger skipped] [NS11] Fix yieldToBadWifi over the policy scoring am: 142f0fe4d4 am: 22acfab1bc -s ours am: cb4d3f43ef -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: Idae15d78ada1402a58eb95a1acff555f28028b02
2021-06-09 02:14:39 +00:00
Chalard Jean
d8186d159f
[automerger skipped] Add doc for NetworkScore#getLegacyInt am: 0422927cd8 am: fd5d21d50e -s ours am: 62e1a5928a -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: I7b69e075b55f59c47e112226f60ca69d59e4a4e8
2021-06-09 02:14:37 +00:00
Chalard Jean
fd24bb7038
[automerger skipped] Expose sendNetworkScore that takes a NetworkScore am: 536a5bac26 am: ecaa23f8e0 -s ours am: de1d74c132 -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: I306e047432a1e6acc420bd9d5262b5d84919ca7d
2021-06-09 02:14:34 +00:00
Yan Yan
d436db2a20
Merge changes I00d1aa47,Icffbe67f am: 77f2e95515 am: 4d50a5f097 am: 64828e9ff3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1690132
Change-Id: I6506025ab2499cd582cee6b3dfbf1bd218ac3196
2021-06-09 02:13:39 +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
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
Chalard Jean
d413b74023
Allow network providers to set the linger duration. am: 550b5214d3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727821
Change-Id: I2a9872dc3da0e89574ae5bab28dfd3bb4c3f3abf
2021-06-08 23:10:08 +00:00
junyulai
602d75b22b
Fix nascent timer never get removed am: 36c02987c6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727820
Change-Id: I706b0a9cff0d9e4a18c62143732b067ef63505b8
2021-06-08 23:10:04 +00:00