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
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
Remi NGUYEN VAN
3c5921caea
Merge "Revert "Add min_sdk_version to connectivity targets""
2021-06-07 08:58:15 +00:00
Remi NGUYEN VAN
0ad52839e7
Revert "Add min_sdk_version to connectivity targets"
...
This reverts commit 326f7bb023 .
Reason for revert: broke errorprone:
"Error: Call requires API level 31 (current min is 30)"
Bug: 190350403
Change-Id: Ib778ba7a882dabc4d42ab9689e1cc51d09d9be62
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
2021-06-07 08:56:05 +00:00
Paul Hu
9a8e4497a3
Merge "Address leftover comments" into sc-dev
2021-06-07 08:50:21 +00:00
Paul Hu
4236e7167c
[automerger skipped] Merge "Implement mobile data preferred uids feature" am: 0a0d7c99c9 am: f22f80f3b1 -s ours am: 983b2852c0 -s ours
...
am skip reason: Merged-In I5153c770650594e05dfa8cf230d7381d790f4a55 with SHA-1 71ad4f1175 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1716396
Change-Id: I4224f84c3c0dc38f69220df54c00623ef465ec4a
2021-06-07 07:38:31 +00:00
Paul Hu
983b2852c0
[automerger skipped] Merge "Implement mobile data preferred uids feature" am: 0a0d7c99c9 am: f22f80f3b1 -s ours
...
am skip reason: Merged-In I5153c770650594e05dfa8cf230d7381d790f4a55 with SHA-1 71ad4f1175 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1716396
Change-Id: I8d3e4954338eeafd1b3a45fd9bb19000fb5fa01f
2021-06-07 07:22:37 +00:00
Paul Hu
f22f80f3b1
Merge "Implement mobile data preferred uids feature" am: 0a0d7c99c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1716396
Change-Id: Id9f5ae6380a00596daeea6fe812873a1aac60b03
2021-06-07 07:03:05 +00:00
Paul Hu
0a0d7c99c9
Merge "Implement mobile data preferred uids feature"
2021-06-07 06:46:59 +00:00
Remi NGUYEN VAN
f18a20afd7
[automerger skipped] Merge "Add min_sdk_version to connectivity targets" am: 51c61941ea am: d40c734524 -s ours am: c76928151b -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/+/1722749
Change-Id: I0a3417e39c137fd9a63fcdefb9d717084269b385
2021-06-07 06:17:48 +00:00
Remi NGUYEN VAN
01a1e65b3c
[automerger skipped] Merge "Build service-connectivity with system_server API" am: c006592307 am: acff4165a4 -s ours am: df77a6a17b -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/+/1722748
Change-Id: Ic0762976ba0cc8decb4a90a4136d57b110878de9
2021-06-07 06:17:39 +00:00
Remi NGUYEN VAN
c76928151b
[automerger skipped] Merge "Add min_sdk_version to connectivity targets" am: 51c61941ea am: d40c734524 -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/+/1722749
Change-Id: I267bda7a156ca2bc26fffefb8e2bcb4cbe4451cb
2021-06-07 05:53:45 +00:00
Remi NGUYEN VAN
df77a6a17b
[automerger skipped] Merge "Build service-connectivity with system_server API" am: c006592307 am: acff4165a4 -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/+/1722748
Change-Id: I44e69b32ff44c8698d2213010cdcab854af9a288
2021-06-07 05:53:31 +00:00
Remi NGUYEN VAN
d40c734524
Merge "Add min_sdk_version to connectivity targets" am: 51c61941ea
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722749
Change-Id: I19cd6635a87d998fa3f046c6845215e73accb33c
2021-06-07 05:36:24 +00:00
Remi NGUYEN VAN
acff4165a4
Merge "Build service-connectivity with system_server API" am: c006592307
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722748
Change-Id: Ib7b959b42034be815210250a3c36de5343faf3c8
2021-06-07 05:33:22 +00:00
Remi NGUYEN VAN
51c61941ea
Merge "Add min_sdk_version to connectivity targets"
2021-06-07 05:18:01 +00:00
Remi NGUYEN VAN
c006592307
Merge "Build service-connectivity with system_server API"
2021-06-07 05:17:21 +00:00
Chiachang Wang
2d8d8f5fe5
[automerger skipped] Add test for ConnectivityManager.factoryReset am: 3d60a42323 am: 1c016b7f07 -s ours
...
am skip reason: Merged-In I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7 with SHA-1 3d60a42323 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840205
Change-Id: Id2b61896a8d901e36d1d3f1669f5a6a904793fe8
2021-06-07 04:36:09 +00:00
Chiachang Wang
f650efb79e
Correct the logic for CtsTetheringUtils.isWifiTetheringSupported am: 0acaa74538 am: 431ca78158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840204
Change-Id: Id2e8a636f4b25e69c3a460f1ba1b69cbdee0d815
2021-06-07 04:35:54 +00:00