Commit Graph

42925 Commits

Author SHA1 Message Date
Treehugger Robot
b2f8a7ac13 Merge "Fix ConnectivityDiagnosticsManagerTest for MTS" am: 3d45c4e432 am: 56ee46f814 am: 3d75600716
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793509

Change-Id: Iec27e6bfc1a866eb2489500a4d1d437e78f431a3
2021-08-16 11:23:39 +00:00
Treehugger Robot
3d75600716 Merge "Fix ConnectivityDiagnosticsManagerTest for MTS" am: 3d45c4e432 am: 56ee46f814
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793509

Change-Id: If83395a7cab0e3e2f5107ae7ba8839a8022b068e
2021-08-16 11:10:27 +00:00
Treehugger Robot
56ee46f814 Merge "Fix ConnectivityDiagnosticsManagerTest for MTS" am: 3d45c4e432
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793509

Change-Id: I18e5cc4fc8f5174682164911844d9d961948f937
2021-08-16 11:00:54 +00:00
Treehugger Robot
3d45c4e432 Merge "Fix ConnectivityDiagnosticsManagerTest for MTS" 2021-08-16 10:51:19 +00:00
Treehugger Robot
3811b0eef4 Merge "Fix a flake in ConnectivityDiagnostics" am: 1ac3e27399 am: 79b4f30495 am: 4fbdc30d3e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796368

Change-Id: I4391c805185500b93026ec2095dc7f3f971f5775
2021-08-16 09:46:22 +00:00
Treehugger Robot
4fbdc30d3e Merge "Fix a flake in ConnectivityDiagnostics" am: 1ac3e27399 am: 79b4f30495
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796368

Change-Id: Ie4a7bd523342c93ca426305153ad8cc312346cae
2021-08-16 09:29:59 +00:00
Treehugger Robot
79b4f30495 Merge "Fix a flake in ConnectivityDiagnostics" am: 1ac3e27399
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796368

Change-Id: If68391d8131cb0d64fe7bfcfdea192fadc24d1cf
2021-08-16 09:12:48 +00:00
Treehugger Robot
1ac3e27399 Merge "Fix a flake in ConnectivityDiagnostics" 2021-08-16 09:01:58 +00:00
Treehugger Robot
a607c4b4f6 [automerger skipped] Merge "Remove unused directories in Connectivity" am: 381ea1f1b1 am: 48181ab964 -s ours am: 770721c281 -s ours
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history

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

Change-Id: I25f95127fdc64fb5ee9919447c93472699004c50
2021-08-16 07:21:46 +00:00
Treehugger Robot
770721c281 [automerger skipped] Merge "Remove unused directories in Connectivity" am: 381ea1f1b1 am: 48181ab964 -s ours
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history

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

Change-Id: Icc5c2a37af69449393a7cc7093823c90efb1766c
2021-08-16 07:11:53 +00:00
Chalard Jean
4da146bd2f Fix a flake in ConnectivityDiagnostics
Bug: none
Test: ConnectivityServiceTest
Change-Id: I9242226be976e7c346addcbaf7e2b0154a3829f7
2021-08-16 16:05:06 +09:00
Treehugger Robot
48181ab964 Merge "Remove unused directories in Connectivity" am: 381ea1f1b1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793470

Change-Id: I2d9d147016b4fc4060a4b04b75a4a00c10876847
2021-08-16 06:57:16 +00:00
Treehugger Robot
381ea1f1b1 Merge "Remove unused directories in Connectivity" 2021-08-16 06:43:07 +00:00
Automerger Merge Worker
7d73167e05 Merge "[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: b5c6036c29 -s ours am: e78344b11f -s ours" into sc-qpr1-dev-plus-aosp 2021-08-13 21:32:38 +00:00
Xin Li
26caca7224 [automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: b5c6036c29 -s ours am: e78344b11f -s ours
am skip reason: Merged-In I592dd5f1d6e13b020beadb11b9d913857a82e524 with SHA-1 58b493abf6 is already in history

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

Change-Id: I921d3a6578e4edc5edda4ddb58695eeff950b3a6
2021-08-13 21:31:40 +00:00
Xin Li
1d289bc66c [automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: b5c6036c29 -s ours am: 21026d8bfb -s ours
am skip reason: Merged-In I592dd5f1d6e13b020beadb11b9d913857a82e524 with SHA-1 58b493abf6 is already in history

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

Change-Id: I2dafd47528674eefb5df79c9fc152e0378d7fc9c
2021-08-13 21:30:44 +00:00
Xin Li
21026d8bfb [automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: b5c6036c29 -s ours
am skip reason: Merged-In I592dd5f1d6e13b020beadb11b9d913857a82e524 with SHA-1 58b493abf6 is already in history

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

Change-Id: I6c8ea5e480616212dee710e111cd4b16d6533b7d
2021-08-13 20:53:31 +00:00
Xin Li
e78344b11f [automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: b5c6036c29 -s ours
am skip reason: Merged-In I592dd5f1d6e13b020beadb11b9d913857a82e524 with SHA-1 58b493abf6 is already in history

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

Change-Id: I5cf84442d3e25629cc8c39fa2dd2b01cfebc8b56
2021-08-13 20:51:43 +00:00
Xin Li
b5c6036c29 Merge stage-aosp-sc-ts-dev before making it an upstream
Bug: 169893837
Merged-In: I592dd5f1d6e13b020beadb11b9d913857a82e524
Change-Id: I9db108c5bf31c17321534a55c1e6e78f46b96c45
2021-08-13 18:26:19 +00:00
Xin Li
de12da7a25 Merge "Merge ab/7633965" into stage-aosp-sc-ts-dev 2021-08-13 00:03:19 +00:00
The Android Open Source Project
7ef5d542cd Merge ab/7633965
Bug: 169893837
Merged-In: I592dd5f1d6e13b020beadb11b9d913857a82e524
Change-Id: I4e01d58ed61c595b704bae6c935d0da1714ee398
2021-08-12 22:28:22 +00:00
Benedict Wong
57dfb7e8a0 Merge "Prevent NPEs when registering/unregistering ConnDiags CBs." am: 5805d3cfd2 am: 5c5ff18089 am: 862d5607aa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1761210

Change-Id: Iefb918cbfecbe6d5a175932d9fb40a181f94c7fe
2021-08-12 21:19:11 +00:00
Benedict Wong
862d5607aa Merge "Prevent NPEs when registering/unregistering ConnDiags CBs." am: 5805d3cfd2 am: 5c5ff18089
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1761210

Change-Id: Ie5209e824f510d7866e74ce61e4b04e4dd8cd84e
2021-08-12 21:01:17 +00:00
Benedict Wong
5c5ff18089 Merge "Prevent NPEs when registering/unregistering ConnDiags CBs." am: 5805d3cfd2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1761210

Change-Id: I0b39f045a4f0b51b278bf182ce36fbcf9c7fb8ca
2021-08-12 20:46:41 +00:00
Benedict Wong
5805d3cfd2 Merge "Prevent NPEs when registering/unregistering ConnDiags CBs." 2021-08-12 20:35:39 +00:00
markchien
d5740febd6 Use SdkLevel util instead of explicitly checking the version am: 932df54493 am: 682e38c9e8 am: 36733a1509
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793481

Change-Id: Ibdd2a9bbb6e4c997d10e66e19d43f3076d23eb06
2021-08-12 14:36:43 +00:00
markchien
36733a1509 Use SdkLevel util instead of explicitly checking the version am: 932df54493 am: 682e38c9e8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793481

Change-Id: I1c467221368f4d19346be59e230a0b3424bb4023
2021-08-12 14:24:14 +00:00
markchien
682e38c9e8 Use SdkLevel util instead of explicitly checking the version am: 932df54493
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793481

Change-Id: I3e3670e2f4c11901a8d3dbbb31f2b277b255d0b6
2021-08-12 14:07:29 +00:00
markchien
932df54493 Use SdkLevel util instead of explicitly checking the version
There are IpServerTest test case fail because the code check the wrong
code name for T pre-release builds.

Bug: 194812819
Test: atest TetheringTests

Change-Id: I73bf58c60b6e790fe0060b60c023c10f5d8cbfa8
2021-08-12 07:08:34 +00:00
Chiachang Wang
a7b89ce7bd Merge "The net cap value should be bit shifted before &ing" am: 43dd35b6fc am: b266811ecf am: a042b9ad03
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1790357

Change-Id: Ic2158b303e59ec23a2c312079499499971d9234d
2021-08-12 05:57:13 +00:00
Chiachang Wang
a042b9ad03 Merge "The net cap value should be bit shifted before &ing" am: 43dd35b6fc am: b266811ecf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1790357

Change-Id: Ib611f1895bc9856adc489a4e5808f5f89d865b16
2021-08-12 05:41:05 +00:00
Chiachang Wang
b266811ecf Merge "The net cap value should be bit shifted before &ing" am: 43dd35b6fc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1790357

Change-Id: I0f62958c27de0e3b87b57012a75cc38c2a3ae692
2021-08-12 05:31:28 +00:00
Chiachang Wang
43dd35b6fc Merge "The net cap value should be bit shifted before &ing" 2021-08-12 05:12:19 +00:00
Remi NGUYEN VAN
cbdb631297 [automerger skipped] Merge "Mock connectivity resources in integration tests" am: d21f0426e7 am: 61eb78e1ee -s ours am: 06d22ebcb5 -s ours
am skip reason: Merged-In Ic33d897690a8ea84a78c01dc5f2b2e2c473d57df with SHA-1 0a37e72f0c is already in history

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

Change-Id: I32ec94b95a8df66a4e7eb2e7cfc55cf068fc9c16
2021-08-12 04:54:09 +00:00
Remi NGUYEN VAN
06d22ebcb5 [automerger skipped] Merge "Mock connectivity resources in integration tests" am: d21f0426e7 am: 61eb78e1ee -s ours
am skip reason: Merged-In Ic33d897690a8ea84a78c01dc5f2b2e2c473d57df with SHA-1 0a37e72f0c is already in history

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

Change-Id: I0c11251fb3ebb154d1382eddd64dd978a5e5a618
2021-08-12 04:41:03 +00:00
Remi NGUYEN VAN
61eb78e1ee Merge "Mock connectivity resources in integration tests" am: d21f0426e7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1785907

Change-Id: I66252bef31ecb412b5e44ff95711ce8eba3e55e8
2021-08-12 04:26:18 +00:00
Remi NGUYEN VAN
d21f0426e7 Merge "Mock connectivity resources in integration tests" 2021-08-12 04:13:57 +00:00
Remi NGUYEN VAN
b2d47200c7 Remove unused directories in Connectivity
The directories were imported by mistake from old git log in the
frameworks/base repository, and are unused.

Bug: 192995539
Test: m
Merged-In: I0d4bd06e79adedbf582d2fed551d9f1bde521fd1
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Change-Id: Ic3ed5d6d25fd87b136d9ae359e7444c4b1289744
2021-08-12 10:15:10 +09:00
Remi NGUYEN VAN
7b2e5fe68e Fix ConnectivityDiagnosticsManagerTest for MTS
When run as part of NetworkStack MTS, ConnectivityDiagnosticsManagerTest
may fail as it verifies behavior that is only present will the latest
tethering (connectivity) module installed.

There is no guarantee that connectivity will be up-to-date for a given
NetworkStack version, especially considering that on R->S device upgrade
NetworkStack is likely to have been updated, but connectivity will be
the factory version. Therefore NetworkStack tests need to cover devices
that do not have an up-to-date connectivity module.

Fix the test by observing that at least on T both module will have newer
behavior. On S, accept both factory and updated behavior.

Bug: 195727283
Test: atest ConnectivityDiagnosticsManagerTest
Change-Id: Ifc0b09c884419d28817cfe619940c979ee1b0b9e
2021-08-11 21:31:37 +09:00
Chiachang Wang
c07315aa08 The net cap value should be bit shifted before &ing
The check intends to do the bit & operation. The net cap value
should be shifted against the original capabilities.

Also fix the typo in the method name.

Bug: 191918212
Test: atest FrameworksNetTests
Change-Id: I98396b2538f36fe8b29d27a544a2dfb3060bc9c5
2021-08-11 14:55:00 +08:00
Aaron Huang
14701cbe88 Merge "Skip wifi stats test if link layer stats is not supported" into sc-dev am: 9ac9c1d575 am: 1a1ab4a4ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15479880

Change-Id: I2c3a4d23c3a1ef8dc26bb9c9b5778ecdcc49f24b
2021-08-11 04:07:03 +00:00
Aaron Huang
eb1a358c7c Merge "Skip wifi stats test if link layer stats is not supported" into sc-dev am: 9ac9c1d575 am: 17bc178920
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15479880

Change-Id: I2120bc057c60b25344a77e2f1c0fbb8a0207e8ee
2021-08-11 04:06:10 +00:00
Aaron Huang
1a1ab4a4ab Merge "Skip wifi stats test if link layer stats is not supported" into sc-dev am: 9ac9c1d575
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15479880

Change-Id: I677f8566496230e8ac6fd141e6e4d79aad4b1cf8
2021-08-11 03:51:56 +00:00
Aaron Huang
17bc178920 Merge "Skip wifi stats test if link layer stats is not supported" into sc-dev am: 9ac9c1d575
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15479880

Change-Id: I5a33f959c8ae5a34584f57508f392038e44062e7
2021-08-11 03:51:12 +00:00
Aaron Huang
1b88f69d99 Skip wifi stats test if link layer stats is not supported
Wifi link layer is an optional feature so this test will be
failed on wifi stats check if a device does not support it.
Add a check to know if the  device supports wifi link layer
stats and skip it if it is not supported.

Ignore-AOSP-First: Needs cherry-picks
Bug: 195518957
Test: CtsNetTestCases:BatteryStatsManagerTest
Change-Id: I592dd5f1d6e13b020beadb11b9d913857a82e524
Merged-In: I592dd5f1d6e13b020beadb11b9d913857a82e524
(cherry picked from commit 58b493abf6)
2021-08-11 03:45:29 +00:00
Aaron Huang
9ac9c1d575 Merge "Skip wifi stats test if link layer stats is not supported" into sc-dev 2021-08-11 03:33:53 +00:00
Aaron Huang
58b493abf6 Skip wifi stats test if link layer stats is not supported
Wifi link layer is an optional feature so this test will be
failed on wifi stats check if a device does not support it.
Add a check to know if the  device supports wifi link layer
stats and skip it if it is not supported.

Ignore-AOSP-First: Needs cherry-picks
Bug: 195518957
Test: CtsNetTestCases:BatteryStatsManagerTest
Change-Id: I592dd5f1d6e13b020beadb11b9d913857a82e524
2021-08-10 14:37:51 +08:00
Chiachang Wang
8cfb47db22 Remove the @Ignore annotation on testAvoidBadWifi am: 73745baa38 am: 3bac051c7a am: 8787b2ab68
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1773885

Change-Id: Idbc1515a1e7b1da0ef0d3e85c1114b839ca7203c
2021-08-10 05:50:40 +00:00
Chiachang Wang
8787b2ab68 Remove the @Ignore annotation on testAvoidBadWifi am: 73745baa38 am: 3bac051c7a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1773885

Change-Id: Ibec81bed964cab7f9bc18cf7cabf0b52d0eeb824
2021-08-10 05:41:23 +00:00
Chiachang Wang
3bac051c7a Remove the @Ignore annotation on testAvoidBadWifi am: 73745baa38
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1773885

Change-Id: I6e57345d5debfb6d50e623dcb9e3e218b2057be5
2021-08-10 05:32:25 +00:00