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
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
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
7d4ab94bc6
Merge "Move ConnectivityCoverageTests to mainline-presubmit"
2021-07-16 06:19:10 +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
Treehugger Robot
8920d32880
Skip bpf offload if upstream interface is VCN
...
Bpf offload do not support VCN network yet, don't start bpf offload
if the interface is ipsec*.
Bug: 191178945
Test: atest TetheringTests
Original-Change: https://android-review.googlesource.com/1764307
Merged-In: I1ad8cededddec42f45b08aaa31d583c548d105f0
Change-Id: I1ad8cededddec42f45b08aaa31d583c548d105f0
2021-07-13 19:14:49 +00:00
Treehugger Robot
4caebb7956
Merge "Skip bpf offload if upstream interface is VCN" am: 097d65b0f3 am: 9743c8165e am: ed62eb3a5b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764307
Change-Id: Ife1175130cd0d4f471ab8bd438cc80d42ee726f1
2021-07-13 18:03:28 +00:00
Treehugger Robot
ed62eb3a5b
Merge "Skip bpf offload if upstream interface is VCN" am: 097d65b0f3 am: 9743c8165e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764307
Change-Id: Id3546b8888439ee9228fb2b5687b117165fdbbd7
2021-07-13 17:45:37 +00:00
Treehugger Robot
9743c8165e
Merge "Skip bpf offload if upstream interface is VCN" am: 097d65b0f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764307
Change-Id: Iee7c4eeaad1aa00b47699bec2838e692ae88edcf
2021-07-13 17:31:09 +00:00
Treehugger Robot
097d65b0f3
Merge "Skip bpf offload if upstream interface is VCN"
2021-07-13 17:16:04 +00:00
markchien
7dc1b4da7b
Skip bpf offload if upstream interface is VCN
...
Bpf offload do not support VCN network yet, don't start bpf offload
if the interface is ipsec*.
Bug: 191178945
Test: atest TetheringTests
Change-Id: I1ad8cededddec42f45b08aaa31d583c548d105f0
2021-07-13 15:35:31 +00:00
Remi NGUYEN VAN
5158467545
[automerger skipped] Jarjar all classes in service-connectivity am: b240e2a86e am: 7c9f83b244 -s ours
...
am skip reason: Merged-In I2aadeca32751267b74d4fd2fd93bb3e8c62e46c0 with SHA-1 b240e2a86e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15261893
Change-Id: I8915ace3e9f712f1820df276c2ae877ca04ff084
2021-07-13 13:00:42 +00:00
Remi NGUYEN VAN
d3dbce627d
[automerger skipped] Jarjar all classes in service-connectivity am: b240e2a86e -s ours am: 668f279e83 -s ours
...
am skip reason: Merged-In I2aadeca32751267b74d4fd2fd93bb3e8c62e46c0 with SHA-1 0755183fae is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15261893
Change-Id: I623ca33140ad9159325b5ce8f4fc5a0e93e24a41
2021-07-13 12:46:49 +00:00
Nucca Chen
9adca644d4
Merge "[CTT-7] Delete the rules while half-closing tcp state entered" am: f7c8cec604 am: d0b818fa8a am: 5cdd98b850
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755173
Change-Id: If94ad650fb6caaca642acad26767c6fe5e4494ef
2021-07-13 12:46:44 +00:00
Nucca Chen
e0ef24ad5a
Merge "[CTT-6] Update TCP conntrack entry timeout while adding rules" am: db30678605 am: f22f935082 am: 523e11ef67
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760692
Change-Id: I3310853fb671077d1e3a0b2ac57811e44349a4f1
2021-07-13 12:46:38 +00:00
Remi NGUYEN VAN
7c9f83b244
Jarjar all classes in service-connectivity am: b240e2a86e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15261893
Change-Id: I764011af0667ca401be07b42086118954c953c2d
2021-07-13 12:46:30 +00:00
Nucca Chen
fb2200c83d
Merge "[CTT-5] Stop update TCP conntrack entry timeout" am: 69ccea4839 am: 23e3eadde5 am: 709d91215f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760691
Change-Id: I376f301787a2fc9a7fd02f3094471bdef0db4e69
2021-07-13 12:46:29 +00:00
Remi NGUYEN VAN
668f279e83
[automerger skipped] Jarjar all classes in service-connectivity am: b240e2a86e -s ours
...
am skip reason: Merged-In I2aadeca32751267b74d4fd2fd93bb3e8c62e46c0 with SHA-1 0755183fae is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15261893
Change-Id: Id04321d1ce840c10b33211ed847b80838b9216f2
2021-07-13 12:45:03 +00:00
Nucca Chen
5cdd98b850
Merge "[CTT-7] Delete the rules while half-closing tcp state entered" am: f7c8cec604 am: d0b818fa8a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755173
Change-Id: Id9d4f2be4e4c0d7840a5d336855dfff92f9666fe
2021-07-13 12:31:20 +00:00
Nucca Chen
523e11ef67
Merge "[CTT-6] Update TCP conntrack entry timeout while adding rules" am: db30678605 am: f22f935082
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760692
Change-Id: I759b26fa36116578c84fd6c226725ece3fbe5b7c
2021-07-13 12:31:16 +00:00
Nucca Chen
709d91215f
Merge "[CTT-5] Stop update TCP conntrack entry timeout" am: 69ccea4839 am: 23e3eadde5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760691
Change-Id: Idf2680669d1c881f3d1846f379f5a8163c4ac274
2021-07-13 12:31:10 +00:00
Nucca Chen
d0b818fa8a
Merge "[CTT-7] Delete the rules while half-closing tcp state entered" am: f7c8cec604
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755173
Change-Id: Ia2243c777d696e1f5bd94d8afd42d43ba1c1d48e
2021-07-13 12:17:54 +00:00
Nucca Chen
f22f935082
Merge "[CTT-6] Update TCP conntrack entry timeout while adding rules" am: db30678605
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760692
Change-Id: Ie5b26c90bc7e7677259ce1be85ce55002cf03d2e
2021-07-13 12:17:48 +00:00
Nucca Chen
23e3eadde5
Merge "[CTT-5] Stop update TCP conntrack entry timeout" am: 69ccea4839
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1760691
Change-Id: Ib1e1c1f2ccdf85bd3a7fd2275abb7ee144207b58
2021-07-13 12:17:43 +00:00
Nucca Chen
f7c8cec604
Merge "[CTT-7] Delete the rules while half-closing tcp state entered"
2021-07-13 12:07:12 +00:00
Nucca Chen
db30678605
Merge "[CTT-6] Update TCP conntrack entry timeout while adding rules"
2021-07-13 12:07:05 +00:00
Nucca Chen
69ccea4839
Merge "[CTT-5] Stop update TCP conntrack entry timeout"
2021-07-13 12:06:55 +00:00