Commit Graph

43231 Commits

Author SHA1 Message Date
Chalard Jean
fd24bb7038 [automerger skipped] Expose sendNetworkScore that takes a NetworkScore am: 536a5bac26 am: ecaa23f8e0 -s ours am: de1d74c132 -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/+/1726730

Change-Id: I306e047432a1e6acc420bd9d5262b5d84919ca7d
2021-06-09 02:14:34 +00:00
Yan Yan
d436db2a20 Merge changes I00d1aa47,Icffbe67f am: 77f2e95515 am: 4d50a5f097 am: 64828e9ff3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1690132

Change-Id: I6506025ab2499cd582cee6b3dfbf1bd218ac3196
2021-06-09 02:13:39 +00:00
Chalard Jean
de1d74c132 [automerger skipped] Expose sendNetworkScore that takes a NetworkScore am: 536a5bac26 am: ecaa23f8e0 -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/+/1726730

Change-Id: Ieb09251372fa335f779a4e65a6e2d15b80fa23a4
2021-06-09 01:57:56 +00:00
Yan Yan
64828e9ff3 Merge changes I00d1aa47,Icffbe67f am: 77f2e95515 am: 4d50a5f097
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1690132

Change-Id: Ie5bc0407bcf43d5186cde53599bd4318b3c4be25
2021-06-09 01:57:25 +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
TreeHugger Robot
c15f75e37a [automerger skipped] Merge "Require location permission for ConnDiags WiFi only." into sc-dev am: 8e345e9637 -s ours am: db12176a4d -s ours
am skip reason: Merged-In I48806533e4e705d2d9be45f3b3d3931d9294b167 with SHA-1 27b6888364 is already in history

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

Change-Id: Ia6668eb2171ce113331d978378b77cabec643679
2021-06-08 15:47:45 +00:00
TreeHugger Robot
17ae6457fa [automerger skipped] Merge "Require location permission for ConnDiags WiFi only." into sc-dev am: 8e345e9637 am: a58037af96 -s ours
am skip reason: Merged-In I48806533e4e705d2d9be45f3b3d3931d9294b167 with SHA-1 7474f67454 is already in history

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

Change-Id: I86ca4c8ef361eb28ad8d180432a835d7d9c6121c
2021-06-08 15:46:43 +00:00
TreeHugger Robot
a58037af96 Merge "Require location permission for ConnDiags WiFi only." into sc-dev am: 8e345e9637
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14885895

Change-Id: Id07bf1a5714a717176d003758fdf9b31fde0833a
2021-06-08 15:32:49 +00:00
TreeHugger Robot
db12176a4d [automerger skipped] Merge "Require location permission for ConnDiags WiFi only." into sc-dev am: 8e345e9637 -s ours
am skip reason: Merged-In I48806533e4e705d2d9be45f3b3d3931d9294b167 with SHA-1 7474f67454 is already in history

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

Change-Id: Ib8134fe3a3e4a717e9ce2a794a3f3b039967aec8
2021-06-08 15:31:05 +00:00
TreeHugger Robot
8e345e9637 Merge "Require location permission for ConnDiags WiFi only." into sc-dev 2021-06-08 15:18:54 +00:00
Frank Li
5d32bb6c5d Merge "Add CTS test for API setLegacyExtraInfo" am: 3103a318bf am: 1cccc8db0e am: aacfddff03
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719131

Change-Id: I7f51fd58fc330be4f78bb19d68e405ae7c402b69
2021-06-08 11:58:10 +00:00
Frank Li
aacfddff03 Merge "Add CTS test for API setLegacyExtraInfo" am: 3103a318bf am: 1cccc8db0e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719131

Change-Id: I6ed1598065cf55021d4ffea88f3c0f21e4e4ff64
2021-06-08 11:42:35 +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
21e4895be5 Merge changes Ib8fe719f,Ia8c05780 am: 7648833bd4 am: f9074acfa3 am: 1f5e9d4d83
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729160

Change-Id: I4f1b3b82bdad6e7dfc50f9c0a0dcdf96091434eb
2021-06-08 10:59:14 +00:00
Mark Chien
1f5e9d4d83 Merge changes Ib8fe719f,Ia8c05780 am: 7648833bd4 am: f9074acfa3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729160

Change-Id: Iae8f9bb61662f17b2aa3ae7f4f4983f94144f799
2021-06-08 10:45:58 +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
Remi NGUYEN VAN
094ba32068 [automerger skipped] Merge changes from topic "framework-conn-stub-cp" am: 674ce27fee am: bdcb9a7baf -s ours am: e9bdf0c514 -s ours
am skip reason: Merged-In I556747f9ba934f8b44b6ea9a518adbccc84ac2a9 with SHA-1 02b94faf80 is already in history

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

Change-Id: Ide7cc78e5f36ecc37b0e8d1255dd6f4e95bb8ba2
2021-06-08 10:04:50 +00:00
Remi NGUYEN VAN
c809fdf4ec [automerger skipped] Merge framework-connectivity impl and stub targets am: e70cd84601 am: b6edc1a9b9 -s ours am: b3f480065e -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/+/1723150

Change-Id: Ic593a078b0b370d05a47006c4bfb8704032db5f0
2021-06-08 10:04:47 +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
e9bdf0c514 [automerger skipped] Merge changes from topic "framework-conn-stub-cp" am: 674ce27fee am: bdcb9a7baf -s ours
am skip reason: Merged-In I556747f9ba934f8b44b6ea9a518adbccc84ac2a9 with SHA-1 02b94faf80 is already in history

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

Change-Id: I579d04cbec63e13f1aff3e3afde781d9545e36b4
2021-06-08 09:56:17 +00:00
Remi NGUYEN VAN
b3f480065e [automerger skipped] Merge framework-connectivity impl and stub targets am: e70cd84601 am: b6edc1a9b9 -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/+/1723150

Change-Id: Ieaea1c915534c2d90c8688f22725f5591cb820f7
2021-06-08 09:56:14 +00:00
Anton Hansson
2dafce0060 Add tethering bootclasspath fragment to its sdk am: 3669599dec am: f61dc66a91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14881273

Change-Id: Iff9ed096a3b8581ae7820e73d6abaafaa4d9f982
2021-06-08 09:40:42 +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
4e20333c8f [automerger skipped] Merge "Add min_sdk_version to connectivity targets" am: 12474fdab5 am: 1534bf0adf -s ours am: 0ced8489fc -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/+/1729155

Change-Id: Ifad931121f3ba379a24c5d7a69fa179e5f953002
2021-06-08 09:34:07 +00:00
Anton Hansson
ec9557f48a Add tethering bootclasspath fragment to its sdk am: 3669599dec am: 175e9a0873
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14881273

Change-Id: I1d027021c7f77c1e0c3dcb28bc1ad511dfe3734a
2021-06-08 09:33:59 +00:00
Remi NGUYEN VAN
0ced8489fc [automerger skipped] Merge "Add min_sdk_version to connectivity targets" am: 12474fdab5 am: 1534bf0adf -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/+/1729155

Change-Id: I79109840fe826185f21c7d79ccb1b80924a0814a
2021-06-08 09:26:07 +00:00
Anton Hansson
f61dc66a91 Add tethering bootclasspath fragment to its sdk am: 3669599dec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14881273

Change-Id: Ib4b4fc6e684f30a1bb9e1d27813274e7701ceeaf
2021-06-08 09:18:34 +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
Anton Hansson
175e9a0873 Add tethering bootclasspath fragment to its sdk am: 3669599dec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14881273

Change-Id: I80ecfa0d0b9f3d1258f6db5402539ba52df98d27
2021-06-08 09:15:00 +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
Paul Hu
bc878d5baf [automerger skipped] Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" am: 7cba5f4163 am: 997f6e9893 -s ours am: 9b574bfcbb -s ours
am skip reason: Merged-In Ibea354d8dda1f02652a193820f3f9eb573b9a956 with SHA-1 a1ac564748 is already in history

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

Change-Id: I13eacf9e2db3acbcf196c2c59c8a0d9906b36a93
2021-06-08 08:35:45 +00:00
Paul Hu
9b574bfcbb [automerger skipped] Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" am: 7cba5f4163 am: 997f6e9893 -s ours
am skip reason: Merged-In Ibea354d8dda1f02652a193820f3f9eb573b9a956 with SHA-1 a1ac564748 is already in history

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

Change-Id: Ib5ba2903f1a5a57764b05ce49617b66343ebd1a9
2021-06-08 08:21:23 +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
1f08ee5565 [automerger skipped] Merge "Address leftover comments" am: e2791b00d3 am: a9d6f3c4c5 -s ours am: 867862c930 -s ours
am skip reason: Merged-In I9056758db15e8a21b84ef244d4cacf24c3b79894 with SHA-1 5d8340f7ae is already in history

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

Change-Id: Id9e8fa7bc4c90510ba1a0e9996abf0c4e0b9a394
2021-06-08 07:19:38 +00:00
Paul Hu
867862c930 [automerger skipped] Merge "Address leftover comments" am: e2791b00d3 am: a9d6f3c4c5 -s ours
am skip reason: Merged-In I9056758db15e8a21b84ef244d4cacf24c3b79894 with SHA-1 5d8340f7ae is already in history

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

Change-Id: Iab3e813878c17b3043a3e0ee72f51b5ca752b0df
2021-06-08 06:58:35 +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
ce497608ad [automerger skipped] Merge "Revert "Add min_sdk_version to connectivity targets"" am: 8665528151 am: ffddb67ddc -s ours am: 3b143d3369 -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/+/1729095

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

Change-Id: I8c2e5d0797a27ecbbdc40e4a72066ff1ad22b971
2021-06-08 05:29:11 +00:00
Remi NGUYEN VAN
7ffe17d7b1 [automerger skipped] Merge "Add min_sdk_version to connectivity targets" am: bf7cffa7a0 am: 4c9c1ed2ac -s ours am: 265f25869d -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/+/1729095

Change-Id: I0656d7bffe78ffdefeac6df2e8b3c1834bad9e30
2021-06-08 05:28:57 +00:00