Commit Graph

43390 Commits

Author SHA1 Message Date
markchien
5db3697641 [automerger skipped] Remove *Locked wording am: 8409a1c297 am: dc664bd9e9 -s ours
am skip reason: Merged-In Ia8c057800cab30cdcbacae4db2d706b6427e9861 with SHA-1 8409a1c297 is already in history

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

Change-Id: I4a45c8adcadb8119143a757dc05728668e765aee
2021-06-10 15:10:26 +00:00
TreeHugger Robot
4890649105 [automerger skipped] Merge changes Ib8fe719f,Ia8c05780 into sc-dev am: 3ea9a136fa -s ours am: af9d24ce45 -s ours
am skip reason: Merged-In Ib8fe719f3c1c4a65e6b5152df5e5adf33aba2079 with SHA-1 21021efbe1 is already in history

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

Change-Id: I2d9d46373f34a9c1a18c35d4fbcbda9fba194587
2021-06-10 15:05:31 +00:00
markchien
dc664bd9e9 Remove *Locked wording am: 8409a1c297
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14673213

Change-Id: I54fea6433eeffd506378cb5246a0ab42fe4de680
2021-06-10 14:54:32 +00:00
TreeHugger Robot
af9d24ce45 [automerger skipped] Merge changes Ib8fe719f,Ia8c05780 into sc-dev am: 3ea9a136fa -s ours
am skip reason: Merged-In Ib8fe719f3c1c4a65e6b5152df5e5adf33aba2079 with SHA-1 21021efbe1 is already in history

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

Change-Id: I5f5bae54bc6138c9e8997be555c91268ce70b92d
2021-06-10 14:52:50 +00:00
TreeHugger Robot
3ea9a136fa Merge changes Ib8fe719f,Ia8c05780 into sc-dev
* changes:
  Suppress IpServer message logs
  Remove *Locked wording
2021-06-10 14:34:08 +00:00
Remi NGUYEN VAN
f892644135 Merge "Update TetheringTests for new connectivity shims" into sc-dev am: b81724602f am: 79471813b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14928587

Change-Id: I6f9e5bb2a7614ade93c9cbca8a3ac54c3bd3cd15
2021-06-10 14:26:10 +00:00
Remi NGUYEN VAN
c4e3886b64 Merge "Update TetheringTests for new connectivity shims" into sc-dev am: b81724602f am: a6255e6589
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14928587

Change-Id: Idd70c9b3937c90f1d8c8ee5e160c97c61b5c5934
2021-06-10 14:25:22 +00:00
Remi NGUYEN VAN
a6255e6589 Merge "Update TetheringTests for new connectivity shims" into sc-dev am: b81724602f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14928587

Change-Id: I0da9c2e6717256ea88176c836ea5b6ac67919a0a
2021-06-10 14:05:20 +00:00
Remi NGUYEN VAN
79471813b4 Merge "Update TetheringTests for new connectivity shims" into sc-dev am: b81724602f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14928587

Change-Id: I3827d12719ddc930a18e8651dd66a2e28b6f92f6
2021-06-10 14:03:59 +00:00
TreeHugger Robot
132ca20505 [automerger skipped] Merge changes I00d1aa47,Icffbe67f into sc-dev am: c056232f0e -s ours am: ec4436317b -s ours
am skip reason: Merged-In I00d1aa475033810a5f60f0e3fc692be87ff62e13 with SHA-1 0dd6de5842 is already in history

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

Change-Id: I46c80569f0e0bfaf7c28d1793d98923b68ed8938
2021-06-10 13:48:52 +00:00
TreeHugger Robot
55f140abfd [automerger skipped] Merge changes I00d1aa47,Icffbe67f into sc-dev am: c056232f0e am: 6f249d2582 -s ours
am skip reason: Merged-In I00d1aa475033810a5f60f0e3fc692be87ff62e13 with SHA-1 0891de6311 is already in history

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

Change-Id: I38e547a5d74486e8aed074a35a05cded6e356971
2021-06-10 13:48:22 +00:00
Yan Yan
546cd9ec1d [automerger skipped] Add tests for new IPsec algorithms in IpSecManagerTest am: 9447bbf6c6 am: 9e754b2514 -s ours
am skip reason: Merged-In Icffbe67fca29b051457dbf863ba3aaf653806a83 with SHA-1 5e692b6ca7 is already in history

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

Change-Id: Ia38a9a9c8956cdcb869732d6ab7d5169277afb73
2021-06-10 13:48:18 +00:00
Remi NGUYEN VAN
b81724602f Merge "Update TetheringTests for new connectivity shims" into sc-dev 2021-06-10 13:45:12 +00:00
Remi NGUYEN VAN
c94a1ffd55 Update TetheringTests for new connectivity shims
The stable connectivity shims are updated to now contain S API, so
tethering tests that assumed that compatibility R behavior was used need
to be updated.

To avoid such failures Tethering tests should have a test target using
updated shims (TetheringNextTests), but this was not done in S
timeframe.

Ignore-AOSP-First: topic needs differences in AOSP
Bug: 189581241
Test: atest TetheringTests
Change-Id: Ibc04e64a1e9d82b67aff10d1a6d77f9e6b1bbdfb
2021-06-10 13:44:00 +00:00
TreeHugger Robot
6f249d2582 Merge changes I00d1aa47,Icffbe67f into sc-dev am: c056232f0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911203

Change-Id: I60f42848b46edcef0d29fa355c663ab08a586c4b
2021-06-10 13:30:55 +00:00
Yan Yan
9e754b2514 Add tests for new IPsec algorithms in IpSecManagerTest am: 9447bbf6c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911202

Change-Id: I9e54e3021f0d938dfb07658e3677c62e3448bf66
2021-06-10 13:30:51 +00:00
TreeHugger Robot
ec4436317b [automerger skipped] Merge changes I00d1aa47,Icffbe67f into sc-dev am: c056232f0e -s ours
am skip reason: Merged-In I00d1aa475033810a5f60f0e3fc692be87ff62e13 with SHA-1 0891de6311 is already in history

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

Change-Id: I6a01c2a351d97af06698e2b07e6c8f811700cec7
2021-06-10 13:28:45 +00:00
markchien
3b3d92ced0 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
Merged-In: Ib8fe719f3c1c4a65e6b5152df5e5adf33aba2079
2021-06-10 21:13:44 +08:00
markchien
8409a1c297 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
Merged-In: Ia8c057800cab30cdcbacae4db2d706b6427e9861
2021-06-10 21:13:07 +08:00
TreeHugger Robot
c056232f0e Merge changes I00d1aa47,Icffbe67f into sc-dev
* changes:
  Add CTS for AES-CMAC
  Add tests for new IPsec algorithms in IpSecManagerTest
2021-06-10 13:11:03 +00:00
Treehugger Robot
73699a7f8d Merge "import copy of bpf_net_helpers.h from system/netd/bpf_progs" am: 28c51a157c am: b6c38f987f am: c3ff65a0b8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733033

Change-Id: I27d601a67fbfe08007c2cd1f68f192ee8149f37e
2021-06-10 06:36:39 +00:00
Treehugger Robot
c3ff65a0b8 Merge "import copy of bpf_net_helpers.h from system/netd/bpf_progs" am: 28c51a157c am: b6c38f987f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733033

Change-Id: I0dea36f0270a493a8a4b5867e07e5e12ac0ec550
2021-06-10 06:18:34 +00:00
Remi NGUYEN VAN
ee395bb629 Merge "Use shell permission to query current user" am: dbb2a23a38 am: 7252278df7 am: 62f6e19968
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730549

Change-Id: I66d06b6217abaa55001d348cdd3ae0b0c1d89a5d
2021-06-10 06:05:00 +00:00
Treehugger Robot
b6c38f987f Merge "import copy of bpf_net_helpers.h from system/netd/bpf_progs" am: 28c51a157c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733033

Change-Id: If7d5655192f64b66a3175bc84ba31585a50848e0
2021-06-10 06:04:58 +00:00
Remi NGUYEN VAN
62f6e19968 Merge "Use shell permission to query current user" am: dbb2a23a38 am: 7252278df7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730549

Change-Id: I74b82e3ff03f0bc540c5023b4a9af9799915e559
2021-06-10 05:53:29 +00:00
Treehugger Robot
28c51a157c Merge "import copy of bpf_net_helpers.h from system/netd/bpf_progs" 2021-06-10 05:50:16 +00:00
Remi NGUYEN VAN
7252278df7 Merge "Use shell permission to query current user" am: dbb2a23a38
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730549

Change-Id: I8a019cc8925ae4abc7e64247aa3cef69b558ce3d
2021-06-10 05:36:39 +00:00
Remi NGUYEN VAN
dbb2a23a38 Merge "Use shell permission to query current user" 2021-06-10 05:19:57 +00:00
Maciej Żenczykowski
23f5d805ed import copy of bpf_net_helpers.h from system/netd/bpf_progs
after this:
  diff system/netd/bpf_progs/bpf_net_helpers.h packages/modules/Connectivity/Tethering/bpf_progs/bpf_net_helpers.h
shows no diff, besides a switch to '#pragma once'
as the include guard.

Test: builds, atest, TreeHugger
Bug: 177884581
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib943321d46254ba64ce206fb9e3b3414d15e4d45
2021-06-09 19:53:13 -07:00
Remi NGUYEN VAN
258cd3bd46 [automerger skipped] Merge "Deprecate MANAGE_ACTIVITY_STACKS permission" am: 45f922a2ff am: f9e22d7f3c -s ours am: 8e9b20a556 -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/+/1731235

Change-Id: I78df8564d4a5a3f55d1077f29bef81dc8c648f61
2021-06-10 00:24:23 +00:00
Treehugger Robot
f841fc480f [automerger skipped] Fix restorePrivateDnsSetting with null hostnames am: 7fd2b373ff -s ours am: 50918e503c -s ours
am skip reason: Merged-In Ic5d8d8b729469e0eef89a0b53f166e604264c1ee with SHA-1 7fd2b373ff is already in history

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

Change-Id: I2e3dc3ff5b32c3dd21fa495ad47d523b637aa46d
2021-06-10 00:24:16 +00:00
Remi NGUYEN VAN
8e9b20a556 [automerger skipped] Merge "Deprecate MANAGE_ACTIVITY_STACKS permission" am: 45f922a2ff am: f9e22d7f3c -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/+/1731235

Change-Id: I4bc77d81a084de087def39025e2812cf4311bb7d
2021-06-10 00:23:28 +00:00
Treehugger Robot
01277a3dee [automerger skipped] Fix restorePrivateDnsSetting with null hostnames am: 7fd2b373ff am: 4db91ab936 -s ours
am skip reason: Merged-In Ic5d8d8b729469e0eef89a0b53f166e604264c1ee with SHA-1 908b002ed2 is already in history

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

Change-Id: I1f60f43ed78512dc671db1feca42d5f73d70c595
2021-06-10 00:23:22 +00:00
Remi NGUYEN VAN
f9e22d7f3c Merge "Deprecate MANAGE_ACTIVITY_STACKS permission" am: 45f922a2ff
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731235

Change-Id: I535c12bc058cb3e3782badac38c11ed763236e4c
2021-06-10 00:06:48 +00:00
Treehugger Robot
4db91ab936 Fix restorePrivateDnsSetting with null hostnames am: 7fd2b373ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911838

Change-Id: If1e643887b191942217d5589f933bd924c0ff849
2021-06-10 00:06:44 +00:00
Treehugger Robot
50918e503c [automerger skipped] Fix restorePrivateDnsSetting with null hostnames am: 7fd2b373ff -s ours
am skip reason: Merged-In Ic5d8d8b729469e0eef89a0b53f166e604264c1ee with SHA-1 908b002ed2 is already in history

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

Change-Id: I60705cb9b8c95a156ea9e6c7bd22c2998c9885ed
2021-06-10 00:05:44 +00:00
Remi NGUYEN VAN
45f922a2ff Merge "Deprecate MANAGE_ACTIVITY_STACKS permission" 2021-06-09 23:45:29 +00:00
Treehugger Robot
203343abe3 Merge "Skip CaptivePortalTest for wearables" am: 3a1a22b82a am: b931a1f392 am: 5fe9b7bcbe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727591

Change-Id: I53d639099bf42d5f4e480607ec8009ca2b844591
2021-06-09 19:52:35 +00:00
Treehugger Robot
5fe9b7bcbe Merge "Skip CaptivePortalTest for wearables" am: 3a1a22b82a am: b931a1f392
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727591

Change-Id: I69fce78c69b847fc7dded60f1c293f0dcc7e8733
2021-06-09 19:29:37 +00:00
Treehugger Robot
b931a1f392 Merge "Skip CaptivePortalTest for wearables" am: 3a1a22b82a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727591

Change-Id: Iaca1c0ae1db503c0f025af737cc83ce60f4ab7e2
2021-06-09 18:42:59 +00:00
Treehugger Robot
3a1a22b82a Merge "Skip CaptivePortalTest for wearables" 2021-06-09 17:59:04 +00:00
Frank Li
c9c8770bc0 Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API" am: 99e50a0fc9 am: e803a53246 am: c1ea6b691f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1693668

Change-Id: Ie9b1edf6b90d647b689e6abbc8f340913c86e153
2021-06-09 12:57:53 +00:00
Frank Li
c1ea6b691f Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API" am: 99e50a0fc9 am: e803a53246
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1693668

Change-Id: If7ddb3f87320a91e1cdda33c99f108c32a760b6d
2021-06-09 12:42:02 +00:00
Frank Li
e803a53246 Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API" am: 99e50a0fc9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1693668

Change-Id: Ib650541c2ff86c0055d97b7dd2d86965126a26f2
2021-06-09 12:28:08 +00:00
Frank Li
99e50a0fc9 Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API" 2021-06-09 12:12:05 +00:00
Treehugger Robot
d08369c53a Merge "Improve handling of invalid private DNS settings" am: b80e88d604 am: 67bb33e5cc am: 4c22076ae4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730543

Change-Id: I08e8b479570fbbeb9f890c9c1437b838f0dee461
2021-06-09 11:51:08 +00:00
Treehugger Robot
4c22076ae4 Merge "Improve handling of invalid private DNS settings" am: b80e88d604 am: 67bb33e5cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730543

Change-Id: I735561c48510ff5d4771888d815d7a336f4ccea7
2021-06-09 11:30:08 +00:00
Treehugger Robot
67bb33e5cc Merge "Improve handling of invalid private DNS settings" am: b80e88d604
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730543

Change-Id: Iddbe866b7df7dbb93f1e6d4cef95ee6e01739abe
2021-06-09 11:09:35 +00:00
Treehugger Robot
b80e88d604 Merge "Improve handling of invalid private DNS settings" 2021-06-09 10:52:14 +00:00
Remi NGUYEN VAN
95bc8d7067 Use shell permission to query current user
Use shell permissions to obtain CREATE_USERS to call
ActivityManager.getCurrentUser in ConnectivityServiceTest.

This is necessary to allow the tests to run in coverage tests without
the platform certificate.

Bug: 187935317
Test: atest FrameworksNetTests:ConnectivityServiceTest
Change-Id: I5a56ffab4820d351dcdb132046698cd0d3b8bdb1
2021-06-09 19:28:16 +09:00