Commit Graph

41769 Commits

Author SHA1 Message Date
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
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
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
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
paulhu
4428044569 Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting
Now, PermissionMonitor reigster observer to listen the change
from all users, but "uids allowed on restricted networks" should
affect to all users instead of per each user. Thus, move the
setting from Settings.Secure to Settings.Global.

Bug: 189705071
Test: atest FrameworksNetTests
Merged-In: Ibea354d8dda1f02652a193820f3f9eb573b9a956

Change-Id: Ibea354d8dda1f02652a193820f3f9eb573b9a956
2021-06-07 08:55:16 +00:00
paulhu
eb43848207 Address leftover comments
- Add comment to highestPermissionForUid()
- Add testAppsAllowedOnRestrictedNetworksChangedMultipleUsers
- Add synchronized to guard mUidsAllowedOnRestrictedNetworks
  access.

Bug: 189705071
Test: atest FrameworksNetTests
Merged-In: I9056758db15e8a21b84ef244d4cacf24c3b79894

Change-Id: I9056758db15e8a21b84ef244d4cacf24c3b79894
2021-06-07 08:54:12 +00:00
Paul Hu
9a8e4497a3 Merge "Address leftover comments" into sc-dev 2021-06-07 08:50:21 +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
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
a90a37e57f [automerger skipped] Add test for ConnectivityManager.factoryReset am: 3d60a42323 -s ours
am skip reason: Merged-In I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7 with SHA-1 6391e22faf is already in history

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

Change-Id: I8746251d2c03173bc88d9808763776a0f7a39996
2021-06-07 04:12:06 +00:00
Chiachang Wang
5707c1aa5e Correct the logic for CtsTetheringUtils.isWifiTetheringSupported am: 0acaa74538
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840204

Change-Id: Iccd80862d1efa710dff13a0195b7f06e9a3057f0
2021-06-07 04:11:57 +00:00
paulhu
51f77dcc49 Implement mobile data preferred uids feature
- Read MOBILE_DATA_PREFERRED_UIDS setting when system ready
- Register MOBILE_DATA_PREFERRED_UIDS setting observer
- Send uid ranges to netd when update mobile data preferred uids

Bug: 171872461
Test: atest FrameworksNetTests
Merged-In: I5153c770650594e05dfa8cf230d7381d790f4a55
(cherry-pick with minor conflicts)

Change-Id: I5153c770650594e05dfa8cf230d7381d790f4a55
2021-06-07 02:55:25 +00:00
Junyu Lai
7254130c57 [automerger skipped] Merge changes Ia930b3d3,If614da81,I975a9439 am: 9756b5d4f9 am: dd917b7f4c -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/+/1722738

Change-Id: I9748cbf5bcafbbbb07949ea6aee30171c8065a50
2021-06-04 21:26:16 +00:00
Chalard Jean
f11a106896 [automerger skipped] [NS04.7] Reinstate a necessary change am: dd35f2dab0 am: f2515d397c -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/+/1722737

Change-Id: Ie8a53fc992c3218df4b927706d459fbaba8637ba
2021-06-04 21:26:15 +00:00
Chalard Jean
42e40e2482 [automerger skipped] [NS04.5] Have NetworkOffer embark a provider ID am: 30689b8fd7 am: c79f3f3a38 -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/+/1722736

Change-Id: I1425f823b74c34d72528144af9f17d60fc6f1408
2021-06-04 21:26:12 +00:00
Junyu Lai
dd917b7f4c Merge changes Ia930b3d3,If614da81,I975a9439 am: 9756b5d4f9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722738

Change-Id: Ie28b41508c9d9f8cc89dca5a621d4cc309ba8654
2021-06-04 21:13:35 +00:00
Chalard Jean
f2515d397c [NS04.7] Reinstate a necessary change am: dd35f2dab0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722737

Change-Id: Ia047b5757328329ceb602ce5dda7ea21e67e9255
2021-06-04 21:13:32 +00:00
Chalard Jean
c79f3f3a38 [NS04.5] Have NetworkOffer embark a provider ID am: 30689b8fd7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722736

Change-Id: Iba7591f32e9a90ced10d6c9f200e84fc28f9246a
2021-06-04 21:13:26 +00:00
Junyu Lai
9756b5d4f9 Merge changes Ia930b3d3,If614da81,I975a9439
* changes:
  [NS04.8] Address comments from NS04 and NS04.5
  [NS04.7] Reinstate a necessary change
  [NS04.5] Have NetworkOffer embark a provider ID
2021-06-04 20:52:38 +00:00
Chiachang Wang
3d60a42323 Add test for ConnectivityManager.factoryReset
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk on R and S device
Merged-In: I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7
Change-Id: I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7
2021-06-04 13:29:54 +00:00
Chiachang Wang
0acaa74538 Correct the logic for CtsTetheringUtils.isWifiTetheringSupported
The existing isWifiTetheringSupported only check if tethering side
supports wifi tethering or not but not wifi side. A expected
behavior should include both of them, so add the wifi side check
into the helper function. Also update in the existing caller side
due to a new parameter added.

Bug: 186061922
Test: atest MtsTetheringTestLatestSdk
Megred-In: Id69ac1d30ab2bbf23e870193335b139f54672636
Change-Id: Id69ac1d30ab2bbf23e870193335b139f54672636
Ignore-AOSP-First: cherry-pick
2021-06-04 13:29:38 +00:00
Paul Hu
9905a69f7e [automerger skipped] Merge "Update allowed on restricted networks getter/setter" am: c30c57c210 am: e6b5402b09 -s ours
am skip reason: Merged-In I979bf98075e6c9c0ed7e891582843fddb62643cb with SHA-1 68aacb407a is already in history

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

Change-Id: I46854ce18a927afd2f8a5a69d3359915125e6761
2021-06-04 11:14:25 +00:00
Paul Hu
e6b5402b09 Merge "Update allowed on restricted networks getter/setter" am: c30c57c210
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719399

Change-Id: I68bf2e5f3b282e98376f24bc11108fd7323c1e06
2021-06-04 10:50:40 +00:00
Paul Hu
c30c57c210 Merge "Update allowed on restricted networks getter/setter" 2021-06-04 10:31:50 +00:00
Frank Li
a08a673bc5 Merge "Add CTS test for NetworkRequest.getCapabilities API" am: ae5bd10a09 am: c49ad80e83
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717737

Change-Id: I455ef5114e96969bb09bd5bbb0034ac4ebbc6f82
2021-06-04 10:04:43 +00:00
Frank Li
c49ad80e83 Merge "Add CTS test for NetworkRequest.getCapabilities API" am: ae5bd10a09
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717737

Change-Id: Id6b9f05c83fe84acae4b72fa54aeb1957853a534
2021-06-04 09:50:32 +00:00
Frank Li
ae5bd10a09 Merge "Add CTS test for NetworkRequest.getCapabilities API" 2021-06-04 09:29:04 +00:00
Paul Hu
7a3102f0f5 Merge "Implement mobile data preferred uids feature" into sc-dev am: 87f2897f90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14732015

Change-Id: I2528dad0ebc73284cf544b1b2e2bd673e5fd69a2
2021-06-04 09:11:35 +00:00
Remi NGUYEN VAN
4dd89c5320 [automerger skipped] Merge "Add OsCompat" am: 1e2ad80467 am: b7d8d93ac9 -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/+/1722747

Change-Id: Ia4e644c979df3da2b08af1d37568f7ecf96a5313
2021-06-04 08:59:16 +00:00
Paul Hu
87f2897f90 Merge "Implement mobile data preferred uids feature" into sc-dev 2021-06-04 08:55:31 +00:00
Remi NGUYEN VAN
b7d8d93ac9 Merge "Add OsCompat" am: 1e2ad80467
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722747

Change-Id: Ic9413d32bedfd6890b7a1bffa286c228af72b32c
2021-06-04 08:37:30 +00:00
Remi NGUYEN VAN
1e2ad80467 Merge "Add OsCompat" 2021-06-04 08:20:30 +00:00
Remi NGUYEN VAN
d9e4d490c3 [automerger skipped] Merge "Remove NetdService, NetworkStackClient dependency" am: 062fda1fb3 am: 8a9935160f -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/+/1722746

Change-Id: Icd377d4aa684fe78f9dfa31d268349159fc67141
2021-06-04 07:39:29 +00:00
Chiachang Wang
d84c904468 Merge "Remove ConnectivityService hidden annotations" am: 0a0a3118fc am: 3c946814b6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723155

Change-Id: I76f466c1a72469291117dfb096c9b9b626eeb9be
2021-06-04 07:39:24 +00:00
Remi NGUYEN VAN
034a7e158e [automerger skipped] Merge "Remove ConnectivityService hidden annotations" am: 448406a3aa am: c02a3e1a2e -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/+/1722745

Change-Id: I4da2effb957cf238dbc6a3d0f682e1c5ac7be52b
2021-06-04 07:39:15 +00:00