Commit Graph

41769 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
ffddb67ddc Merge "Revert "Add min_sdk_version to connectivity targets"" am: 8665528151
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729694

Change-Id: I289f613fe3576cd13f9fe4da091df25fe42f497a
2021-06-08 04:55:03 +00:00
Remi NGUYEN VAN
4c9c1ed2ac Merge "Add min_sdk_version to connectivity targets" am: bf7cffa7a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729095

Change-Id: I74f741739686c4172301ef052ee55167995cb0ea
2021-06-08 04:54:36 +00:00
Remi NGUYEN VAN
8665528151 Merge "Revert "Add min_sdk_version to connectivity targets"" 2021-06-08 04:52:03 +00:00
Remi NGUYEN VAN
ccd2a6aeb4 Revert "Add min_sdk_version to connectivity targets"
This reverts commit 0b900c91f6.

Reason for revert: Broke errorprone: b/190454846

Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I21de7e7e06daa5f4a688b4246986f8d44da97c91
Fixes: 190454846
2021-06-08 04:50:01 +00:00
Remi NGUYEN VAN
bf7cffa7a0 Merge "Add min_sdk_version to connectivity targets" 2021-06-08 04:38:30 +00:00
Remi NGUYEN VAN
0ee7f803ac [automerger skipped] Merge "Add lint baseline to address NewApi errors" am: 8bf9411324 am: 5768410eb7 -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/+/1729094

Change-Id: I754141dc8deebd3880a3a38d977d5687bdf7f0d7
2021-06-08 04:17:38 +00:00
Remi NGUYEN VAN
5768410eb7 Merge "Add lint baseline to address NewApi errors" am: 8bf9411324
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729094

Change-Id: I05903fe08c1137dc757db7f0deedda93c60600c0
2021-06-08 03:59:09 +00:00
Remi NGUYEN VAN
8bf9411324 Merge "Add lint baseline to address NewApi errors" 2021-06-08 03:28:26 +00:00
Remi NGUYEN VAN
0b900c91f6 Add min_sdk_version to connectivity targets
All targets need min_sdk_version 30 to be included in the tethering
APEX. They will actually never be used on SDK 30 and are only loaded on
31, but this is necessary to be included in com.android.tethering.

Original change (project moved):
I190fd1f3c9fabff057d0a2bd7f45b63a4fe447b3

Bug: 171540887
Test: m
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I3db00acc79b11058a1c235916b9bfe6c759afda5
2021-06-08 09:28:26 +09:00
Pedro Loureiro
8f16b39776 Add lint baseline to address NewApi errors
We are enabling a new lint check where the min sdk != compile sdk.
It has produced a lot of errors and adding the baseline file(s)
allows us to continue work without introducing more problems.

This is a partial cherry-pick of change merged downstream.

Bug: 150847901

Test: m lint-check
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I214d60e858b7c03885d4d1c9a083e67a9340b4fe
2021-06-08 09:28:12 +09:00
Chalard Jean
f4c48a4d5f Enable policy ranking
Test: Passes all presubmits, been tested in labs
Bug: 184834350
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: If33884aa245bcc8817bbc9c2fdfab035249e7301
Change-Id: If33884aa245bcc8817bbc9c2fdfab035249e7301
  (cherry-picked from ag/14150470)
2021-06-08 00:17:38 +00:00
Chalard Jean
8c32adf149 Adjust a test for policy scoring
Bug: 184834350
Test: this
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: Ib161503c0e6f73c5b5017ae554bbdc28ac3edb3e
Change-Id: Ib161503c0e6f73c5b5017ae554bbdc28ac3edb3e
  (cherry-picked from ag/14272003)
2021-06-08 00:17:38 +00:00
junyulai
a95eef727e Add CTS to verify NetworkAgent#setLingerDuration
Test: this
Bug: 184227264
Fix: 184796264
Merged-In: I77818685b2bfea499c0294874d205544161677c5
Change-Id: I77818685b2bfea499c0294874d205544161677c5
  (cherry-picked from ag/14104367)
2021-06-08 00:17:37 +00:00
Chalard Jean
550b5214d3 Allow network providers to set the linger duration.
Test: atest CtsNetTestCases:NetworkAgentTest#testSetLingerDuration
CTS-Coverage-Bug: 184796264
Bug: 184227264
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I7f420faa40863385114705d6971cf00887d03318
Change-Id: I7f420faa40863385114705d6971cf00887d03318
  (cherry-picked from ag/14100410)
2021-06-08 00:17:37 +00:00
junyulai
36c02987c6 Fix nascent timer never get removed
By design, the nascent timer will be removed after a network
satisfied first request. However, this never happens.
Because the mInactive is false when that happens, so isNascent
is never true.

Furthermore, when removing a nascent timer, the inactivity
state can never be updated since no condition in the
updateInactivityState will be met to update the state correctly.

Thus, update inactive state accordingly when adding/removing the
nascent timer.

Test: TH
Bug: 184227264
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I4c1521b6e0ef68ac489771a2ab6b09ef3e381577
Change-Id: I4c1521b6e0ef68ac489771a2ab6b09ef3e381577
  (cherry-picked from ag/14060609)
2021-06-08 00:17:37 +00:00
Chalard Jean
c81d4c3c7e [NS13] Remove the last usage of the legacy int
Note that this requires removing part of a test, because
that part is testing that the a 50 bonus of the legacy
int is stronger than the validation penalty, which is
not a mechanic we want to have. When WiFi is unvalidated
and cell is unvalidated, cell should be kept in case it
validates, like is described in comments in
isNetworkPotentialSatisfier ; however this test is
checking that it *IS* reaped off if the wifi score is
strong enough. This should be incorrect, and should not
be tested, so this patch removes the check.

Test: ConnectivityServiceTest
Bug: 184834350
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I8966abee59fea2d9f10f082aba87df6588b72762
Change-Id: I8966abee59fea2d9f10f082aba87df6588b72762
  (cherry-picked from ag/14127306)
2021-06-08 00:17:37 +00:00
Chalard Jean
d89e56da6b Add documentation
Bug: 185121472
Test: doc-only change
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I5fd68b209959043f6fe15ac34629c51233fea596
Change-Id: I5fd68b209959043f6fe15ac34629c51233fea596
  (cherry-picked from ag/14186082)
2021-06-08 00:17:37 +00:00
Chalard Jean
5e8f8431d8 Use filter from CollectionUtils.
Test: ConnectivityServiceTest
Fixes: 184826320
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: Iae8df6058c0a43fba1e6ebcd6003df54751f9646
Change-Id: Iae8df6058c0a43fba1e6ebcd6003df54751f9646
  (cherry-picked from ag/14125157)
2021-06-08 00:17:36 +00:00
Chalard Jean
9f6d447a42 Fix a bug where updates of offers won't find existing offers
.equals() only work on cross-process Binder instances if casted to
a Binder instance first.

Bug: 184281544
Test: ConnectivityServiceTest. CTS test for this specific issue to come
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I7b9e0df21a3cca59659867a75792289ddee2f1d7
Change-Id: I7b9e0df21a3cca59659867a75792289ddee2f1d7
  (cherry-picked from ag/14125149)
2021-06-08 00:17:36 +00:00
Chalard Jean
29cb06a3e0 [NS12] Address comments on NS09
Test: ConnectivityServiceTest
Fixes: 184507247
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: Ic4500dc85507fa68538c9ec179ec6eb4f44c5022
Change-Id: Ic4500dc85507fa68538c9ec179ec6eb4f44c5022
  (cherry-picked from ag/14091168)
2021-06-08 00:17:36 +00:00
Chalard Jean
142f0fe4d4 [NS11] Fix yieldToBadWifi over the policy scoring
This doesn't reactivate the test because it's not yet fixed over int
scoring.

Bug: 184834350
Test: Remove @Ignore and run testAvoidBadWifi
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I32477db52eb50faabc499fa68e24ba07577782aa
Change-Id: I32477db52eb50faabc499fa68e24ba07577782aa
  (cherry-picked from ag/14064906)
2021-06-08 00:17:36 +00:00
Chalard Jean
0422927cd8 Add doc for NetworkScore#getLegacyInt
Test: comment-only change
Fixes: 184786246
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I8306f01f3d247986683e272074047e3ad190f68e
Change-Id: I8306f01f3d247986683e272074047e3ad190f68e
  (cherry-picked from ag/14125152)
2021-06-08 00:17:36 +00:00
Chalard Jean
536a5bac26 Expose sendNetworkScore that takes a NetworkScore
Bug: 167544279
Test: FrameworksNetTests
CTS-Coverage-Bug: 184037351
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I5dd9b526c53cb99a5e4ae87f1e3724a7a1870e78
Change-Id: I5dd9b526c53cb99a5e4ae87f1e3724a7a1870e78
  (cherry-picked from ag/14048551)
2021-06-08 00:17:36 +00:00
Treehugger Robot
27b6888364 Require location permission for ConnDiags WiFi only.
This CL updates ConnectivityDiagnostics permission checks in
ConnectivityService to only require location permission for Networks
that have TRANSPORT_WIFI. This change is consistent with the location
restrictions required for the transports themselves. Previously,
location permissions were required for all Network types.

Bug: 187310575
Test: atest ConnectivityServiceTest ConnectivityDiagnosticsManagerTest
Change-Id: I48806533e4e705d2d9be45f3b3d3931d9294b167
Merged-In: I48806533e4e705d2d9be45f3b3d3931d9294b167
(cherry picked from commit 0990af5148)
2021-06-07 22:17:05 +00:00
Yan Yan
0891de6311 Add CTS for AES-CMAC
This commit:
  - Verify AES-CMAC is supported in device that first
      launched with SDK beyond R
  - Verify IpSecTransforms can be built with AES-CMAC and
      traffic flows

Bug: 171083832
Test: atest IpSecManagerTest
Test: AES-CMAC tests are manually enabled and verified
Change-Id: I00d1aa475033810a5f60f0e3fc692be87ff62e13
2021-06-07 15:05:57 -07:00
Yan Yan
5e692b6ca7 Add tests for new IPsec algorithms in IpSecManagerTest
This CL adds CTS tests that:
- Verify IpSecAlgorithm#getSupportedAlgorithms
- Verify new algorithms are supported in device that first
  launched with SDK beyond R
- Verify IpSecTransforms can be built with new algortihms and
  traffic flows

Since there is no hardware that first launched with SDK beyond R
at the time of writing this CL, tests for new algorithms were
manually enabled and verified on the pixel with an updated kernel.

Bug: 171083832
Test: atest IpSecManagerTest
Change-Id: Icffbe67fca29b051457dbf863ba3aaf653806a83
2021-06-07 15:01:46 -07:00
lifr
0fd78de2c6 Add CTS test for API setLegacyExtraInfo
Adding in-depth test in NetworkAgentTest
Bug: 187040803
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
      atest CtsNetTestCases:android.net.NetworkAgentConfigTest
Change-Id: Ief14f6de0cb6913da944414f0b134eb04346425f
2021-06-07 20:22:47 +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
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
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
Anton Hansson
3669599dec Add tethering bootclasspath fragment to its sdk
This subsumes the java_sdk_library in the sdk.

Bug: 188427719
Test: build_mainline_modules.sh
Change-Id: Ib2ebb3893135b4dd91812f1f1b0915540cfd64cb
2021-06-07 15:46:33 +01: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
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