Commit Graph

44760 Commits

Author SHA1 Message Date
paulhu
f16cd9c0df [automerger skipped] Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity am: bee1c6d9cd am: a73afb9790 -s ours am: 23f47f35dc -s ours
am skip reason: Merged-In I2f155592b08cdbf259a00b035cacb37ca9847e72 with SHA-1 e0f3796bbb is already in history

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

Change-Id: I9187d193aaaa79ea955a2c8a607fadda1a113793
2021-07-19 12:26:09 +00:00
Remi NGUYEN VAN
e5772017be Merge "Wait for next network in waitForAvailable" am: e9f65535e0 am: f38d076a83 am: 0e526cd506
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760698

Change-Id: Ib0cb160c285495e0c8f4ad85fca2d29785d0cc02
2021-07-19 12:24:20 +00:00
paulhu
23f47f35dc [automerger skipped] Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity am: bee1c6d9cd am: a73afb9790 -s ours
am skip reason: Merged-In I2f155592b08cdbf259a00b035cacb37ca9847e72 with SHA-1 e0f3796bbb is already in history

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

Change-Id: I3e9ab49e543dc0970671b12139906d7469710acd
2021-07-19 10:25:48 +00:00
Remi NGUYEN VAN
0e526cd506 Merge "Wait for next network in waitForAvailable" am: e9f65535e0 am: f38d076a83
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760698

Change-Id: Iafeca4e8049214af7871da406c2e2ddfe1c18df8
2021-07-19 10:25:11 +00:00
paulhu
a73afb9790 Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity am: bee1c6d9cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686026

Change-Id: I6dd95839749f877a272070387130aada5a157062
2021-07-19 10:08:41 +00:00
Remi NGUYEN VAN
f38d076a83 Merge "Wait for next network in waitForAvailable" am: e9f65535e0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760698

Change-Id: I3390ce0ad504e7367840ef13b9311e889a9798b1
2021-07-19 10:06:02 +00:00
Remi NGUYEN VAN
1b7753d680 Merge "Skip BatteryStatsManagerTest on Q" am: e2067816e9 am: 4bcefe111a am: 354f5cf7d0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764310

Change-Id: I2ddf45299974c4016388a80d37c11f4d4a939bc8
2021-07-19 09:52:31 +00:00
Remi NGUYEN VAN
e9f65535e0 Merge "Wait for next network in waitForAvailable" 2021-07-19 09:47:12 +00:00
Remi NGUYEN VAN
354f5cf7d0 Merge "Skip BatteryStatsManagerTest on Q" am: e2067816e9 am: 4bcefe111a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764310

Change-Id: I4168b127b63517c80aebbf270ecd0ec0b2f122cb
2021-07-19 09:39:21 +00:00
Remi NGUYEN VAN
4bcefe111a Merge "Skip BatteryStatsManagerTest on Q" am: e2067816e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764310

Change-Id: Iac778fc5dfe0b5ec0adf400372b3e43c5cc76d5d
2021-07-19 09:25:12 +00:00
Remi NGUYEN VAN
e2067816e9 Merge "Skip BatteryStatsManagerTest on Q" 2021-07-19 09:11:54 +00:00
Treehugger Robot
97979c9e90 Merge "No-op cleanup" am: 21592b0d93 am: 866b9c4480 am: fa45b598d5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1769285

Change-Id: Id826a9b4659d9d10d7477e107c3cf640322f484c
2021-07-16 16:51:35 +00:00
Treehugger Robot
fa45b598d5 Merge "No-op cleanup" am: 21592b0d93 am: 866b9c4480
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1769285

Change-Id: Ib19a5d93e0b4e2f305a80ccf8841a36a5e7bda74
2021-07-16 16:38:19 +00:00
Treehugger Robot
866b9c4480 Merge "No-op cleanup" am: 21592b0d93
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1769285

Change-Id: I4ea2b3bd3ab5f8c58aca5ca602e22a67f6f8e0d1
2021-07-16 16:25:17 +00:00
Treehugger Robot
21592b0d93 Merge "No-op cleanup" 2021-07-16 16:08:05 +00:00
Remi NGUYEN VAN
d0e94978df Merge "Add ConnectivityCoverageTests to presubmit" am: 0909afc08a am: 4d5342d396 am: fd5d3a5617
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1768348

Change-Id: Ic6f9e4bb96094b63af88e31ac6a2f418ae135b38
2021-07-16 06:55:38 +00:00
Remi NGUYEN VAN
bcc3fe72fc Merge "Move ConnectivityCoverageTests to mainline-presubmit" am: 7d4ab94bc6 am: dfc744c81e am: c4a7f75dc8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754249

Change-Id: I276ac2106e3644afe3e7c1b55ab542ac0ece0f4d
2021-07-16 06:55:22 +00:00
Remi NGUYEN VAN
fd5d3a5617 Merge "Add ConnectivityCoverageTests to presubmit" am: 0909afc08a am: 4d5342d396
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1768348

Change-Id: I39afdc1740908dbcd7e5fdf87f66a955b4108538
2021-07-16 06:46:06 +00:00
Remi NGUYEN VAN
c4a7f75dc8 Merge "Move ConnectivityCoverageTests to mainline-presubmit" am: 7d4ab94bc6 am: dfc744c81e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754249

Change-Id: If0dee06aa3865ebdb232ebcf39c646fa7e993092
2021-07-16 06:45:59 +00:00
Remi NGUYEN VAN
4d5342d396 Merge "Add ConnectivityCoverageTests to presubmit" am: 0909afc08a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1768348

Change-Id: Ia83ac341917eee98078d6328f66d90b5a42fa028
2021-07-16 06:31:02 +00:00
Remi NGUYEN VAN
dfc744c81e Merge "Move ConnectivityCoverageTests to mainline-presubmit" am: 7d4ab94bc6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754249

Change-Id: I2858a01588c723da64efba2e110097d58b868e86
2021-07-16 06:30:51 +00:00
Remi NGUYEN VAN
0909afc08a Merge "Add ConnectivityCoverageTests to presubmit" 2021-07-16 06:20:00 +00:00
Remi NGUYEN VAN
7d4ab94bc6 Merge "Move ConnectivityCoverageTests to mainline-presubmit" 2021-07-16 06:19:10 +00:00
Chalard Jean
6d8f2fbf99 No-op cleanup
Test: atest ConnectivityServiceTest
Change-Id: Ic07c94785d97bd654ffce960e8bc2652c2dbc3d6
2021-07-16 12:02:22 +09:00
Remi NGUYEN VAN
48c68886ee Add ConnectivityCoverageTests to presubmit
The tests are now consistently green in postsubmit.

Bug: 187935317
Change-Id: Ib04e5de8e57bd9cca0c9244f12a9668f97ba46f9
Test: Need TH to test
2021-07-16 01:36:16 +00:00
Remi NGUYEN VAN
cb671b6082 Merge "Fix jarjar-related failures in coverage tests" am: e9f7f1e3d4 am: c6bf1e19a4 am: c595c6461c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764731

Change-Id: Ia2b8025bcd43abae9c856626b4a150ac5a89c363
2021-07-15 09:31:40 +00:00
Remi NGUYEN VAN
ff23b67a3b Merge "Use TRANSPORT_USB from the SDK" am: ca688d62d3 am: 048ef34b88 am: 1e79e9322b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764734

Change-Id: I19c424de0b48733accf46965fabc615913f4b1d7
2021-07-15 09:29:32 +00:00
Remi NGUYEN VAN
c595c6461c Merge "Fix jarjar-related failures in coverage tests" am: e9f7f1e3d4 am: c6bf1e19a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764731

Change-Id: If9fb707bf6e80b8937a41eb6306b2e2e0589a626
2021-07-15 09:28:55 +00:00
Remi NGUYEN VAN
c6bf1e19a4 Merge "Fix jarjar-related failures in coverage tests" am: e9f7f1e3d4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764731

Change-Id: I4a380aba04862af13f01a9d02e3e27c86b22c111
2021-07-15 09:03:23 +00:00
Remi NGUYEN VAN
1e79e9322b Merge "Use TRANSPORT_USB from the SDK" am: ca688d62d3 am: 048ef34b88
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764734

Change-Id: I7ff0480df0d7997ea68422d1fe315fa94c5a0556
2021-07-15 09:02:04 +00:00
Remi NGUYEN VAN
048ef34b88 Merge "Use TRANSPORT_USB from the SDK" am: ca688d62d3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764734

Change-Id: I7a7d4d6006c5b40e3cb553b8b836a7b93d917065
2021-07-15 09:01:26 +00:00
Remi NGUYEN VAN
5a1f2f7108 Move ConnectivityCoverageTests to mainline-presubmit
Recent runs have been passing in mainline-postsubmit.

Non-mainline presubmit will be added later, after it has been passing
consistently for some time.

Bug: 187935317
Change-Id: I20e3d6f11458f00ff75f32419b964c97635995b1
Test: TH needs to test
2021-07-15 05:25:58 +00:00
Remi NGUYEN VAN
e9f7f1e3d4 Merge "Fix jarjar-related failures in coverage tests" 2021-07-15 05:19:18 +00:00
Remi NGUYEN VAN
ca688d62d3 Merge "Use TRANSPORT_USB from the SDK" 2021-07-15 04:55:38 +00:00
Frank Li
302ebcb6c9 [automerger skipped] Merge "Cleanup the public API getActiveNetworkForUid on AOSP" am: 588a92abe4 am: 806baad21b -s ours am: 8dde213a97 -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/+/1749326

Change-Id: I21bdf7be53ab00aed9023223ef957d22ddec5633
2021-07-14 17:15:02 +00:00
Frank Li
8dde213a97 [automerger skipped] Merge "Cleanup the public API getActiveNetworkForUid on AOSP" am: 588a92abe4 am: 806baad21b -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/+/1749326

Change-Id: I6fdaa0c679437cdeb7de3c0052615faa647e3801
2021-07-14 17:02:21 +00:00
Frank Li
806baad21b Merge "Cleanup the public API getActiveNetworkForUid on AOSP" am: 588a92abe4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749326

Change-Id: I74f0e25208fa797e2953752a4b41cf5eec872136
2021-07-14 16:39:48 +00:00
Frank Li
588a92abe4 Merge "Cleanup the public API getActiveNetworkForUid on AOSP" 2021-07-14 16:23:20 +00:00
lifr
538f079d20 Cleanup the public API getActiveNetworkForUid on AOSP
In order to make ConnectivityService the mainline module in ANDROID 12,
The earliest ConnectivityService API getActiveNetworkForUid was exposed.

But after that public api getActiveNetworkForUid and all callers
(Outside the module) has been deleted or replaced in android 12
version. So we should delete the public API in AOSP to keep the APIs
of Android 12 & AOSP consistent and also avoid using it again in AOSP.
The commit is equivalent to ag/14029494, but done in a different repo.

Bug: 183465229
Test: atest ConnectivityControllerTest
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I50a39d6391c88bbb914a63fdb17bae6851591c01
2021-07-14 21:13:45 +08:00
lucaslin
dd081f5c66 [automerger skipped] Ignore checking TRANSPORT_USB when Android version is older than S am: eadb0add66 am: 4eb7434fed -s ours am: 45e34a8cfb -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/+/1764733

Change-Id: Id44765e7f189ee3b56af3b19e3da5e3bc73688d0
2021-07-14 09:48:07 +00:00
lucaslin
45e34a8cfb [automerger skipped] Ignore checking TRANSPORT_USB when Android version is older than S am: eadb0add66 am: 4eb7434fed -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/+/1764733

Change-Id: Ia8a4d0b704932fe0c60e27b8153a091c12a50c05
2021-07-14 09:39:05 +00:00
lucaslin
4eb7434fed Ignore checking TRANSPORT_USB when Android version is older than S am: eadb0add66
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764733

Change-Id: Idbe4a10d48e80ebab1b98bf083d2326e6281d55d
2021-07-14 09:26:45 +00:00
Remi NGUYEN VAN
732584bcb8 Use TRANSPORT_USB from the SDK
Stop using the stopgap TRANSPORT_USB from NetworkCapabilitiesUtil, which
is being removed.

Bug: 184158327
Test: atest NetworkCapabilitiesTest
Change-Id: I6bbb35d39ff67d6f53b389689dc9f1067e64f962
2021-07-14 16:35:11 +09:00
lucaslin
eadb0add66 Ignore checking TRANSPORT_USB when Android version is older than S
There is a new transport type - TRANSPORT_USB(8) in Android S,
so when the test tries to add this new transport type in older
Android version, it cannot pass the transport type validation and
make test fail.

(clean cherry-pick of change in downstream branch history)
Original change ID before project move:
I38816173b04ea198d99f64f45e9271ac2641e4ac

Bug: 184158327
Test: run CtsNetTestCasesLatestSdk on Android R & Q
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Ib0368241771d287c09c0e4463f91122533f85a27
2021-07-14 16:28:58 +09:00
Remi NGUYEN VAN
ed8efa75b4 Fix jarjar-related failures in coverage tests
Instead of jarjaring the whole com.android.internal.util package, apply
the jarjar rules per-class. Jarjaring the whole package causes problems
in tests, as for example ConnectivityServiceTest depends on Vpn that
uses other internal utils as hidden API, and these should not be
jarjared.

Also avoid jarjaring INetdUnsolicitedEventListener which is used by
NetdEventListenerServiceTest, and ensure KeepalivePacketDataUtilTest
expects the right package name in toString.

Generally the problems appear because ConnectivityCoverageTests also
includes tests for classes that are not part of the connectivity module,
and use hidden APIs that refer to classes that should not be jarjared.
Some of the tests could be excluded from the coverage suite instead, but
keeping them is helpful for future modularization efforts.

Test: Build service-connectivity, dexdump classes and verify jarjared
      atest ConnectivityCoverageTests
Change-Id: Id6b7e6833d49fa03d9442d7c1c3e4dc16fb48dfc
2021-07-14 15:22:56 +09:00
Treehugger Robot
1512b6526b [automerger skipped] Skip bpf offload if upstream interface is VCN am: 8920d32880 am: a010946698 -s ours
am skip reason: Merged-In I1ad8cededddec42f45b08aaa31d583c548d105f0 with SHA-1 8920d32880 is already in history

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

Change-Id: Icdf370e31a14204663d80ed0e0b6ab3670321e7c
2021-07-14 04:32:56 +00:00
Treehugger Robot
836e74fbb7 [automerger skipped] Skip bpf offload if upstream interface is VCN am: 8920d32880 -s ours am: 9e199e7b5d -s ours
am skip reason: Merged-In I1ad8cededddec42f45b08aaa31d583c548d105f0 with SHA-1 7dc1b4da7b is already in history

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

Change-Id: I9d605717c484b7e137aefa503ba78eff84f82297
2021-07-14 04:32:23 +00:00
Treehugger Robot
a010946698 Skip bpf offload if upstream interface is VCN am: 8920d32880
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15275452

Change-Id: I792afdf613ece1645419b2846fa8844385e15599
2021-07-14 04:23:46 +00:00
Treehugger Robot
9e199e7b5d [automerger skipped] Skip bpf offload if upstream interface is VCN am: 8920d32880 -s ours
am skip reason: Merged-In I1ad8cededddec42f45b08aaa31d583c548d105f0 with SHA-1 7dc1b4da7b is already in history

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

Change-Id: Ib424c48811a7a709f2c051c602ae681c786cbfaf
2021-07-14 04:22:04 +00:00
Remi NGUYEN VAN
4ba3adc4e5 Skip BatteryStatsManagerTest on Q
BatteryStatsManager did not exist on Q, so it cannot and should not be
tested there.

Bug: 193586822
Test: atest CtsNetTestCasesLatestSdk on Q
Change-Id: Ia9bef7c3438c25e1a4cb403b27cb0084bbd4f824
2021-07-14 12:06:51 +09:00