Commit Graph

36474 Commits

Author SHA1 Message Date
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
Chalard Jean
6a529e1a7a [NS13] Remove the last usage of the legacy int am: c81d4c3c7e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727817

Change-Id: I58b48e44563e52d1cce3aa604be148bbadb1fb9f
2021-06-08 23:10:01 +00:00
Chalard Jean
435354afe6 Add documentation am: d89e56da6b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727816

Change-Id: I1d71d2116bc800d9bfd8fb53cd70c3cbc8c1a0ed
2021-06-08 23:09:58 +00:00
Chalard Jean
b0b3e93682 Use filter from CollectionUtils. am: 5e8f8431d8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727815

Change-Id: Ic10e7ca8b202dd788f1ef878997f78ec11c82770
2021-06-08 23:09:55 +00:00
Chalard Jean
605a2a6fcb Fix a bug where updates of offers won't find existing offers am: 9f6d447a42
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727814

Change-Id: If3f706ec47d892221d7d4a23063015edb9edf72e
2021-06-08 23:09:52 +00:00
Chalard Jean
d39f2dbd78 [NS12] Address comments on NS09 am: 29cb06a3e0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727813

Change-Id: I7fc08dfe2babc2e0eea526436a52a8c2658f3624
2021-06-08 23:09:50 +00:00
Chalard Jean
22acfab1bc [NS11] Fix yieldToBadWifi over the policy scoring am: 142f0fe4d4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727812

Change-Id: Ie216a888a6effcf285468e063b66d04f18b8b7c7
2021-06-08 23:09:46 +00:00
Chalard Jean
fd5d21d50e Add doc for NetworkScore#getLegacyInt am: 0422927cd8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727811

Change-Id: Iefcf115b045de94d28fb9d0fe047b27445701851
2021-06-08 23:09:43 +00:00
Chalard Jean
ecaa23f8e0 Expose sendNetworkScore that takes a NetworkScore am: 536a5bac26
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1726730

Change-Id: Id63fba1ea3b4e169559771ba62b8e0bf7a6afa00
2021-06-08 23:09:36 +00:00
Yan Yan
4d50a5f097 Merge changes I00d1aa47,Icffbe67f am: 77f2e95515
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1690132

Change-Id: I59255aaea77c826accc2198ca7f01fca4b57c93f
2021-06-08 22:53:14 +00:00
Yan Yan
77f2e95515 Merge changes I00d1aa47,Icffbe67f
* changes:
  Add CTS for AES-CMAC
  Add tests for new IPsec algorithms in IpSecManagerTest
2021-06-08 22:30:16 +00:00
Frank Li
1cccc8db0e Merge "Add CTS test for API setLegacyExtraInfo" am: 3103a318bf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719131

Change-Id: I2cab45cff92215389eb6bba7b14270e3329d600d
2021-06-08 11:28:34 +00:00
Frank Li
3103a318bf Merge "Add CTS test for API setLegacyExtraInfo" 2021-06-08 11:15:06 +00:00
Mark Chien
f9074acfa3 Merge changes Ib8fe719f,Ia8c05780 am: 7648833bd4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729160

Change-Id: Ia8ff14142da45de950d2bac507ed5b943d81533e
2021-06-08 10:26:52 +00:00
Mark Chien
7648833bd4 Merge changes Ib8fe719f,Ia8c05780
* changes:
  Suppress IpServer message logs
  Remove *Locked wording
2021-06-08 10:02:44 +00:00
Remi NGUYEN VAN
bdcb9a7baf Merge changes from topic "framework-conn-stub-cp" am: 674ce27fee
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723151

Change-Id: Id06b8ddac302e9ed0aaba137d45cf1da1e709ce8
2021-06-08 09:36:00 +00:00
Remi NGUYEN VAN
b6edc1a9b9 Merge framework-connectivity impl and stub targets am: e70cd84601
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723150

Change-Id: Ia52b0081f916dc06be7b89c339236689807b454b
2021-06-08 09:35:54 +00:00
Remi NGUYEN VAN
674ce27fee Merge changes from topic "framework-conn-stub-cp"
* changes:
  Reference framework-connectivity stubs explicitly
  Merge framework-connectivity impl and stub targets
2021-06-08 09:15:15 +00:00
Remi NGUYEN VAN
1534bf0adf Merge "Add min_sdk_version to connectivity targets" am: 12474fdab5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729155

Change-Id: I1d5eadb1baf7915a7f017788588865626ad2b563
2021-06-08 09:06:32 +00:00
Remi NGUYEN VAN
12474fdab5 Merge "Add min_sdk_version to connectivity targets" 2021-06-08 08:44:21 +00:00
markchien
21021efbe1 Suppress IpServer message logs
To avoid log flooding, suppress CMD_IPV6_TETHER_UPDATE and
CMD_NEIGHBOR_EVENT message log because they appear frequentlg and
don't have any content which means they are ueseless for debugging.
Also remove logMessage from BaseServingState to fix duplicated
message because all the message already log in TetheredState
and LocalHotspotState which inherit BaseServingState.

Bug: 162920185
Bug: 185649441
Test: atest TetheringCoverageTests
      atest MtsTetheringTestLatestSdk
      atest CtsTetheringTest
Change-Id: Ib8fe719f3c1c4a65e6b5152df5e5adf33aba2079
2021-06-08 15:57:04 +08:00
markchien
dc5903ae56 Remove *Locked wording
Since tethering run in single thread without any synchronized lock,
remove "Locked" wording from the methods which the use lock before.

Bug: 162920185
Test: atest TetheringCoverageTest
Change-Id: Ia8c057800cab30cdcbacae4db2d706b6427e9861
2021-06-08 15:56:14 +08:00
Paul Hu
997f6e9893 Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" am: 7cba5f4163
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729092

Change-Id: Ib2e80a59085eea9decade271da3dec2b5a3e2b72
2021-06-08 07:47:06 +00:00
Paul Hu
7cba5f4163 Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" 2021-06-08 07:23:39 +00:00
Paul Hu
a9d6f3c4c5 Merge "Address leftover comments" am: e2791b00d3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729091

Change-Id: I97628a5e88d4410f0745c4a0b1d1bc3bef8111e5
2021-06-08 06:36:02 +00:00
Remi NGUYEN VAN
e70cd84601 Merge framework-connectivity impl and stub targets
Instead of using api_only: true, use a single java_sdk_library to
generate both framework-connectivity stubs and
framework-connectivity.impl.

Original change (project moved):
I76d7cf1ba31a3f38ae6b9facbf1b668860c8c165

Bug: 183600168
Test: m
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I07d8c4c92c91939b8e8890fdb5db517b75faee2c
2021-06-08 15:24:05 +09:00
Remi NGUYEN VAN
f20103940e Reference framework-connectivity stubs explicitly
To merge the framework-connectivity and framework-connectivity.impl
targets, framework-connectivity stubs need to be referenced explicitly
in java_sdk_libraries, otherwise the build system will currently see
dependency cycles.

Bug: 183600168
Test: m
Merged-In: I556747f9ba934f8b44b6ea9a518adbccc84ac2a9
Change-Id: I0ff10dcb553115d349e287c9f648d77579158f9d
2021-06-08 15:24:05 +09:00
Remi NGUYEN VAN
da43ef0b68 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

This also includes changes to the lint baseline to make it match actual
filenames.

Bug: 171540887
Test: m
Test: m lint-check
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I24198565bc98d85d0c036be02e3a6c311b5bb2a3
2021-06-08 15:23:40 +09:00
Paul Hu
e2791b00d3 Merge "Address leftover comments" 2021-06-08 06:18:19 +00:00
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
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
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
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