Commit Graph

43160 Commits

Author SHA1 Message Date
Junyu Lai
d1a1693cd3 [automerger skipped] Merge "[NS10] Fix a bug where registerIgnoringScore is broken" am: 217f4ad9b1 am: aedcd7822c -s ours am: 66b9f546fb -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/+/1723146

Change-Id: Ifba70cab9285fe1beadce1bcafe26cd1558ba2aa
2021-06-07 19:36:57 +00:00
Treehugger Robot
8c3dd6182b Merge "Require location permission for ConnDiags WiFi only." am: 5cfbc2e4cc am: 058e8f9f28 am: 0deed353b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718590

Change-Id: I66d6f1f2f4004a9aa3dfa2a26fa2375581c87b80
2021-06-07 19:36:50 +00:00
Junyu Lai
66b9f546fb [automerger skipped] Merge "[NS10] Fix a bug where registerIgnoringScore is broken" am: 217f4ad9b1 am: aedcd7822c -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/+/1723146

Change-Id: I813e2b7ec389bc833c000559d14b6310d1ea3bb2
2021-06-07 19:22:24 +00:00
Treehugger Robot
0deed353b7 Merge "Require location permission for ConnDiags WiFi only." am: 5cfbc2e4cc am: 058e8f9f28
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718590

Change-Id: I10a6a9c97cf7bfdde877a9d061b03990a830833c
2021-06-07 19:22:18 +00:00
Junyu Lai
aedcd7822c Merge "[NS10] Fix a bug where registerIgnoringScore is broken" am: 217f4ad9b1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723146

Change-Id: I97b92d1249d60fca6a2c674dd296ec0b75dfd46e
2021-06-07 19:01:48 +00:00
Treehugger Robot
058e8f9f28 Merge "Require location permission for ConnDiags WiFi only." am: 5cfbc2e4cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718590

Change-Id: I1cd0d5563416630dac3baa769c96b40838a5e9b8
2021-06-07 19:01:19 +00:00
Junyu Lai
217f4ad9b1 Merge "[NS10] Fix a bug where registerIgnoringScore is broken" 2021-06-07 18:53:37 +00:00
Treehugger Robot
5cfbc2e4cc Merge "Require location permission for ConnDiags WiFi only." 2021-06-07 18:44:48 +00:00
Chalard Jean
c2f55eef9e [automerger skipped] [NS09] Implement the new ranking code am: e4aeac6d75 am: 9134beb0e0 -s ours am: 21c6c1d96e -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/+/1723145

Change-Id: Ie2def0acf1b9f7efa31c33e5f9353f85728927ba
2021-06-07 17:12:12 +00:00
Chalard Jean
8cbe6ebb59 [automerger skipped] [NS08] Expose public NetworkScore API am: e3d2481792 am: aacf61c306 -s ours am: d835cf01bc -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/+/1723144

Change-Id: I64db07462e1c24369eecae2cb1dff182c02d3cbc
2021-06-07 17:12:10 +00:00
Chalard Jean
21c6c1d96e [automerger skipped] [NS09] Implement the new ranking code am: e4aeac6d75 am: 9134beb0e0 -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/+/1723145

Change-Id: I08a9413757b8dda2bcfc6b12a51158454dc6626b
2021-06-07 16:49:50 +00:00
Chalard Jean
d835cf01bc [automerger skipped] [NS08] Expose public NetworkScore API am: e3d2481792 am: aacf61c306 -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/+/1723144

Change-Id: I44d19a0eb2b66f2d59c26d1c5966032629161d11
2021-06-07 16:49:47 +00:00
Chalard Jean
9134beb0e0 [NS09] Implement the new ranking code am: e4aeac6d75
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723145

Change-Id: I64e07af6e5da388e58967b98289709915af6e0e4
2021-06-07 16:30:42 +00:00
Chalard Jean
aacf61c306 [NS08] Expose public NetworkScore API am: e3d2481792
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723144

Change-Id: I6da6cfa821cbd2e0c9425de209370bb4e0b878a3
2021-06-07 16:30:34 +00:00
Chalard Jean
59ff483635 [automerger skipped] [NS07] Add the rest of the scoring policy am: f3ff362210 am: 789b9b4ae3 -s ours am: 7e5405ce00 -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/+/1723143

Change-Id: I0b682200692bd5a68aa5f1f4475a34a863046304
2021-06-07 15:50:45 +00:00
Chalard Jean
7e5405ce00 [automerger skipped] [NS07] Add the rest of the scoring policy am: f3ff362210 am: 789b9b4ae3 -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/+/1723143

Change-Id: I2290ef623f1ef6da39bfdfc32efb356f3455a8c9
2021-06-07 15:22:46 +00:00
Chalard Jean
789b9b4ae3 [NS07] Add the rest of the scoring policy am: f3ff362210
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723143

Change-Id: I95a5f8359e12c71a4593356e1994d49260e4349b
2021-06-07 15:03:02 +00:00
Chalard Jean
03ea3e6fd4 [automerger skipped] [NS06] Implement the don't-reap mechanism am: 947acd4275 am: f7fc878b82 -s ours am: 9a9ab04661 -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/+/1723142

Change-Id: I966bb9f5b5d24f69e81f5fcd50052eb49af35d8a
2021-06-07 14:33:37 +00:00
James Mattis
a6abe14373 [automerger skipped] Updating tests to honor per-app TRACK_DEFAULT am: 5c3bb5b1ce am: 5706b8961d -s ours am: 585a62288d -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/+/1723153

Change-Id: I99bb7fb86a4b95446411c7ea3b9bb1e38fc71498
2021-06-07 14:33:35 +00:00
Chalard Jean
2f3c4ca303 [automerger skipped] [NS05] Feed network offer callbacks am: 0354d8c7e0 am: b6fac46c0d -s ours am: dcb5aac3dd -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/+/1722739

Change-Id: I76c9cb57fbb22fdbe1862a00e9abd58597cb84c5
2021-06-07 14:33:32 +00:00
Chalard Jean
9a9ab04661 [automerger skipped] [NS06] Implement the don't-reap mechanism am: 947acd4275 am: f7fc878b82 -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/+/1723142

Change-Id: I7944e5628ce21b1d08fe4f9195523847de3df653
2021-06-07 14:17:22 +00:00
James Mattis
585a62288d [automerger skipped] Updating tests to honor per-app TRACK_DEFAULT am: 5c3bb5b1ce am: 5706b8961d -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/+/1723153

Change-Id: I7967eefef39fce3299931401cd8f0b650a7588ee
2021-06-07 14:17:21 +00:00
Chalard Jean
dcb5aac3dd [automerger skipped] [NS05] Feed network offer callbacks am: 0354d8c7e0 am: b6fac46c0d -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/+/1722739

Change-Id: I4b657a482d81244d4f3d11647d778ce1d075f1d5
2021-06-07 14:17:18 +00:00
Chalard Jean
f7fc878b82 [NS06] Implement the don't-reap mechanism am: 947acd4275
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723142

Change-Id: If1e034d04ab5789fb2eb4c0e43966aa2b39d4e39
2021-06-07 13:59:15 +00:00
James Mattis
5706b8961d Updating tests to honor per-app TRACK_DEFAULT am: 5c3bb5b1ce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723153

Change-Id: I144339a24f956aa4144efebf298eda3d323e4d2b
2021-06-07 13:59:12 +00:00
Chalard Jean
b6fac46c0d [NS05] Feed network offer callbacks am: 0354d8c7e0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722739

Change-Id: I63ca1b23495d9979a08cd572b04401d68ea379bc
2021-06-07 13:59:05 +00:00
Nikita Ioffe
96c5b5175e [automerger skipped] Merge "Mark tethering apex as compressible" into sc-dev am: 8148656efc am: 9f59763887 -s ours
am skip reason: Merged-In I621305e47b5b86408a72c622b1e367cd0e75f82c with SHA-1 5f33357348 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14748198

Change-Id: Ibfd38d1e0341b2dd60070ce37c4042ddf88caacf
2021-06-07 11:49:06 +00:00
Nikita Ioffe
3a19731003 [automerger skipped] Merge "Mark tethering apex as compressible" into sc-dev am: 8148656efc -s ours am: 8249eb4f5f -s ours
am skip reason: Merged-In I621305e47b5b86408a72c622b1e367cd0e75f82c with SHA-1 31cef5ebe2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14748198

Change-Id: Ic90d65b9624e7251c1cb5f115fe563582aaa2f6f
2021-06-07 11:44:11 +00:00
Nikita Ioffe
9f59763887 Merge "Mark tethering apex as compressible" into sc-dev am: 8148656efc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14748198

Change-Id: I63b46890d67d85972a4d5ad0700d2917828f9fb6
2021-06-07 11:30:26 +00:00
Nikita Ioffe
8249eb4f5f [automerger skipped] Merge "Mark tethering apex as compressible" into sc-dev am: 8148656efc -s ours
am skip reason: Merged-In I621305e47b5b86408a72c622b1e367cd0e75f82c with SHA-1 31cef5ebe2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14748198

Change-Id: If5177afcb7024ecf4743e0cce324e77a784d8b17
2021-06-07 11:28:38 +00:00
Nikita Ioffe
8148656efc Merge "Mark tethering apex as compressible" into sc-dev 2021-06-07 11:13:35 +00:00
Chalard Jean
94ca04b255 [NS10] Fix a bug where registerIgnoringScore is broken
Fixes: 184028345
Test: ConnectivityServiceTest
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: Ib5cd2c27a2bd0f53b500e8edbe48126fbf58f34d
Change-Id: Ib5cd2c27a2bd0f53b500e8edbe48126fbf58f34d
  (cherry-picked from ag/14034625)
2021-06-07 11:00:49 +00:00
Chalard Jean
e4aeac6d75 [NS09] Implement the new ranking code
At this stage, this is turned off. Unit tests will be
in a followup change.

Test: In a followup
Bug: 167544279
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I4448a3546fbc1a3dddf757982c031c5f39ba2889
Change-Id: I4448a3546fbc1a3dddf757982c031c5f39ba2889
  (cherry-picked from ag/14010222 with fixes)
2021-06-07 11:00:46 +00:00
Chalard Jean
e3d2481792 [NS08] Expose public NetworkScore API
This exposes the two bits settable by the network agents in
Android S on NetworkScore. This is meant to be extensible in
future releases, or possibly for OEM upstreams.

Test: builds
CTS-Coverage-Bug: 184037351
Bug: 167544279
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: Id7ee1bd3e2679f0bd5200d5c299f18a33b87847c
Change-Id: Id7ee1bd3e2679f0bd5200d5c299f18a33b87847c
  (cherry-picked from ag/14010221)
2021-06-07 10:57:49 +00:00
Chalard Jean
f3ff362210 [NS07] Add the rest of the scoring policy
Bug: 167544279
Test: FrameworksNetTests
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I5ea44a94ac6f16486274e9091f15a84734db2341
Change-Id: I5ea44a94ac6f16486274e9091f15a84734db2341
  (cherry-picked from ag/13988828)
2021-06-07 10:57:49 +00:00
Chalard Jean
947acd4275 [NS06] Implement the don't-reap mechanism
This exposes a mechanism for network providers to tell
the network stack that a given network must be kept up
for some specific reason. This is meant to be easier
for them than to have to file a request, in particular
because there is no guaranteed way to make sure the
request will be best matched by any given network.

Test: new test for this
Bug: 167544279
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I238a3ee5ee9262477a23b897e4141769dd1505d1
Change-Id: I238a3ee5ee9262477a23b897e4141769dd1505d1
  (cherry-picked from ag/13929760)
2021-06-07 10:57:49 +00:00
James Mattis
5c3bb5b1ce Updating tests to honor per-app TRACK_DEFAULT
Per-app APIs in ConnectivityService will now have their fallback
request which tracks the system default be of type TRACK_DEFAULT
as opposed to REQUEST. Existing tests which expect this fallback request
to be sent to network factories need to be updated to validate this
change.

Bug: 180452284
Bug: 176494815
Test: atest FrameworksNetTests
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I5125755b3ed1ec535494e2d7a48c0860710ed056
Change-Id: I5125755b3ed1ec535494e2d7a48c0860710ed056
  (cherry-picked from ag/14286730)
2021-06-07 10:57:48 +00:00
Chalard Jean
0354d8c7e0 [NS05] Feed network offer callbacks
The design is very simply expressed :
An offer is needed for a request if and only if that offer
might beat the satisfier for that request.

The implementation of "might beat" is NetworkRanker#mightBeat.

Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Bug: 167544279
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I0fe911eef2483ecbac48c733d56283b81538690a
Change-Id: I0fe911eef2483ecbac48c733d56283b81538690a
  (cherry-picked from 7b6a33bd50)
2021-06-07 10:57:48 +00:00
Paul Hu
1f0bedc75a Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" into sc-dev am: 48fc715694 am: 6c3f2ea641
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772857

Change-Id: Ideb3ac973b14322c08b0e097a565292032086c63
2021-06-07 10:12:59 +00:00
Paul Hu
cc6d37eb9f Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" into sc-dev am: 48fc715694 am: 9bd5882024
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772857

Change-Id: I3ffed344107e0540b55abf5b046ee2160d3c5b30
2021-06-07 09:51:26 +00:00
Paul Hu
6c3f2ea641 Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" into sc-dev am: 48fc715694
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772857

Change-Id: I1d74e05699d3ccaf882b9f8cc9d78ac39dd4483c
2021-06-07 09:50:24 +00:00
Remi NGUYEN VAN
ea522933b8 [automerger skipped] Merge "Revert "Add min_sdk_version to connectivity targets"" am: 3c5921caea am: 10b055f672 -s ours am: a9f417930b -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722749

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729090

Change-Id: I62cdba139032ec9273856de53d9aa5a3f2bfe5f9
2021-06-07 09:50:16 +00:00
Paul Hu
9bd5882024 Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" into sc-dev am: 48fc715694
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772857

Change-Id: I45b1bc2e2930454d8a7fb662153d46e762da62b4
2021-06-07 09:48:36 +00:00
Remi NGUYEN VAN
a9f417930b [automerger skipped] Merge "Revert "Add min_sdk_version to connectivity targets"" am: 3c5921caea am: 10b055f672 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722749

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729090

Change-Id: I42fb4aa1e1e658ea01c5f8eba659294c200f4ff2
2021-06-07 09:31:08 +00:00
Paul Hu
48fc715694 Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" into sc-dev 2021-06-07 09:29:56 +00:00
Paul Hu
eec28a66c4 Merge "Address leftover comments" into sc-dev am: 9a8e4497a3 am: 31218d45ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772851

Change-Id: I2f9e9aca7979ad5495903908159854235184708d
2021-06-07 09:18:05 +00:00
Paul Hu
bda83c82af Merge "Address leftover comments" into sc-dev am: 9a8e4497a3 am: b9d5a0b545
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772851

Change-Id: I4c8555d797ca6d10f3ec18b9a198ca49fb85d05d
2021-06-07 09:17:07 +00:00
Remi NGUYEN VAN
10b055f672 Merge "Revert "Add min_sdk_version to connectivity targets"" am: 3c5921caea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729090

Change-Id: Ibf47b8342adea61de753b6ca841f22c2015c019f
2021-06-07 09:12:29 +00:00
Paul Hu
b9d5a0b545 Merge "Address leftover comments" into sc-dev am: 9a8e4497a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772851

Change-Id: Ie3e82c84cdfe8a9ea6a01859501f67ea472bc969
2021-06-07 09:03:47 +00:00
Paul Hu
31218d45ae Merge "Address leftover comments" into sc-dev am: 9a8e4497a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772851

Change-Id: I6e3a372dd3593a295fbde5785b1bb7d9004a313c
2021-06-07 09:02:00 +00:00