Commit Graph

45853 Commits

Author SHA1 Message Date
Chiachang Wang
8e4530c439 Merge "Enable strict_updatability_linting in connectivity src" am: 81bc609550 am: e5c363a3bd am: 6a1c5dc295
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1902533

Change-Id: I30bcf47dc757cd3fa8672aa9bc775ba612daa65a
2021-12-08 03:29:53 +00:00
Chiachang Wang
6a1c5dc295 Merge "Enable strict_updatability_linting in connectivity src" am: 81bc609550 am: e5c363a3bd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1902533

Change-Id: I72d4c4b29530a8c0b93f368bbb6ce7cbb44e4b8f
2021-12-08 03:17:06 +00:00
Chiachang Wang
e5c363a3bd Merge "Enable strict_updatability_linting in connectivity src" am: 81bc609550
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1902533

Change-Id: I5cf42aa64a838f711cd1ecc589f86aecb19b358f
2021-12-08 02:53:16 +00:00
Chiachang Wang
81bc609550 Merge "Enable strict_updatability_linting in connectivity src" 2021-12-08 02:36:16 +00:00
Paul Hu
f5a8e6aaf0 Merge "Remove NsdSettings from test" am: 5c3c3af9b6 am: b8c0a764bd am: 9c885da24c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908687

Change-Id: Idd673ff2140a7ee574f408e94bdaf100918b0fb3
2021-12-07 06:37:27 +00:00
Paul Hu
9c885da24c Merge "Remove NsdSettings from test" am: 5c3c3af9b6 am: b8c0a764bd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908687

Change-Id: Icd336be49a5ce52cfaa09b5dbf85991032c2b67d
2021-12-07 06:16:02 +00:00
Paul Hu
b8c0a764bd Merge "Remove NsdSettings from test" am: 5c3c3af9b6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908687

Change-Id: Id2ff4ca8c54ea88966d78d4000384ea4aa780ad4
2021-12-07 06:01:16 +00:00
Paul Hu
5c3c3af9b6 Merge "Remove NsdSettings from test" 2021-12-07 05:43:44 +00:00
Treehugger Robot
7162fa0871 Merge "Flake fix : Wait setting applied before returning from setConfig" am: f575d053d4 am: 5f5e9d2e37 am: 9ed83662d4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895332

Change-Id: Ib1f1897fdc8af977b12d955bc7f4bb52c802cae0
2021-12-06 07:13:20 +00:00
Treehugger Robot
9ed83662d4 Merge "Flake fix : Wait setting applied before returning from setConfig" am: f575d053d4 am: 5f5e9d2e37
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895332

Change-Id: I3134f28723989b91995354979a1d710925733882
2021-12-06 07:02:44 +00:00
Treehugger Robot
5f5e9d2e37 Merge "Flake fix : Wait setting applied before returning from setConfig" am: f575d053d4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895332

Change-Id: Iee56a747ef47ca48a27d6f5abbc3352667fbaef3
2021-12-06 06:46:34 +00:00
Treehugger Robot
f575d053d4 Merge "Flake fix : Wait setting applied before returning from setConfig" 2021-12-06 06:27:54 +00:00
paulhu
850bd91c3a Remove NsdSettings from test
NsdSettings has been removed from NsdService, so the test needs
to update accordingly.

Bug: 206702844
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I23b6323b2d870746737370b9a3fc90e530e3d2ed
2021-12-03 22:26:39 +08:00
Ken Chen
1c96ed7db0 Merge "[NETD-BPF#4] Move bpf_shared.h from netd to module" am: 3f8d3ff9bf am: 303a4916de am: 686a2635a2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870274

Change-Id: I85d13f04ecc44767eb917c0d8ae1e85df54e3e7b
2021-12-03 09:50:47 +00:00
Ken Chen
686a2635a2 Merge "[NETD-BPF#4] Move bpf_shared.h from netd to module" am: 3f8d3ff9bf am: 303a4916de
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870274

Change-Id: Ibce1c83bcc995a705f3130395a6a89acbab680b9
2021-12-03 09:33:49 +00:00
Ken Chen
303a4916de Merge "[NETD-BPF#4] Move bpf_shared.h from netd to module" am: 3f8d3ff9bf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870274

Change-Id: Ic25002c1cb0ad702be4114b91ce5114da716531b
2021-12-03 09:20:00 +00:00
Ken Chen
3f8d3ff9bf Merge "[NETD-BPF#4] Move bpf_shared.h from netd to module" 2021-12-03 08:15:06 +00:00
Ken Chen
81b77bd051 Merge "[NETD-BPF#3] Relocate Tethering/bpf_progs and rename bpf_tethering_headers" am: 5fabfd8dd0 am: 47790a1f63 am: ca19ff4dc9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870273

Change-Id: I5d079078cc963eb59f7136c8b59fb13db6cfd52d
2021-12-02 14:00:25 +00:00
Ken Chen
ca19ff4dc9 Merge "[NETD-BPF#3] Relocate Tethering/bpf_progs and rename bpf_tethering_headers" am: 5fabfd8dd0 am: 47790a1f63
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870273

Change-Id: Ib90018a3f17b05eadcf9a6fd374199aff2446f87
2021-12-02 13:38:40 +00:00
Ken Chen
47790a1f63 Merge "[NETD-BPF#3] Relocate Tethering/bpf_progs and rename bpf_tethering_headers" am: 5fabfd8dd0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870273

Change-Id: I4cb74d3265b36f028e4e08e8c06a3d5b503c6052
2021-12-02 13:09:45 +00:00
Ken Chen
5fabfd8dd0 Merge "[NETD-BPF#3] Relocate Tethering/bpf_progs and rename bpf_tethering_headers" 2021-12-02 12:54:01 +00:00
Treehugger Robot
41adb141e1 Merge "Ensure created fd being closed" am: 5b98fb05d6 am: f09b6f6414 am: be2d19fd2a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904462

Change-Id: If013f0c6573ccf6469d4c7e1b639215ccdbd9c76
2021-12-01 11:38:56 +00:00
Treehugger Robot
be2d19fd2a Merge "Ensure created fd being closed" am: 5b98fb05d6 am: f09b6f6414
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904462

Change-Id: Ic3accb191a849151cac002f4fa7a2974543000f5
2021-12-01 11:27:10 +00:00
Treehugger Robot
f09b6f6414 Merge "Ensure created fd being closed" am: 5b98fb05d6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904462

Change-Id: I52413f636dc427bd4568eb1bdd3db9da65f020ec
2021-12-01 11:10:23 +00:00
Treehugger Robot
5b98fb05d6 Merge "Ensure created fd being closed" 2021-12-01 10:49:26 +00:00
Chiachang Wang
0209c36662 Ensure created fd being closed
If exception s thrown while calling bindSocket(fd), the temporary
created ParcelFileDescriptor may not be closed as expected.

Ensure it's closed eventually.

Bug: 206042872
Test: atest FrameworksNetTests
Change-Id: Icde895978ab9281006ffd56335d1247462d9da28
2021-12-01 14:46:29 +08:00
Chalard Jean
99c4cf0541 Remove the legacy int policy from NetworkRanker am: 132ff9ef2e am: 57864d9400 am: cc0a4fc1de
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1906317

Change-Id: I384db652bece92286e51941971e8b66df792ab17
2021-11-30 13:40:29 +00:00
Chalard Jean
cc0a4fc1de Remove the legacy int policy from NetworkRanker am: 132ff9ef2e am: 57864d9400
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1906317

Change-Id: I51a11f7c7894665587b2c5c695533229a2620baa
2021-11-30 13:30:31 +00:00
Chalard Jean
57864d9400 Remove the legacy int policy from NetworkRanker am: 132ff9ef2e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1906317

Change-Id: I2847dc951d05916da1dc41a1f06e63180bbb0162
2021-11-30 13:11:21 +00:00
Chalard Jean
132ff9ef2e Remove the legacy int policy from NetworkRanker
This code is now dead and can't be resurrected. It can safely
be removed.

Test: FrameworksNetTests
Change-Id: I7bc2ce3d43a92e463b6aed73914c3f7a3a0c8103
2021-11-30 20:00:55 +09:00
Chalard Jean
8d094daba9 Flake fix : Wait setting applied before returning from setConfig
Test: DnsResolverTest
Change-Id: I2e8d487a736d84ab37caf5a9aa95751ddd383588
2021-11-30 16:50:15 +09:00
Treehugger Robot
ecf04b8592 Merge "Competing network interfaces" am: 44a20af4a3 am: cac7575885 am: 558c2644de
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903360

Change-Id: I1e392904d89cfeae5158c4031e3fd5c2e66fc521
2021-11-29 10:13:57 +00:00
Treehugger Robot
558c2644de Merge "Competing network interfaces" am: 44a20af4a3 am: cac7575885
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903360

Change-Id: I6063144af454a7eda179ec06cea816ac033e002e
2021-11-29 09:56:25 +00:00
Treehugger Robot
cac7575885 Merge "Competing network interfaces" am: 44a20af4a3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903360

Change-Id: I358c9a83623dd93ce06d423bcde7720f1dc39a84
2021-11-29 09:44:19 +00:00
Treehugger Robot
44a20af4a3 Merge "Competing network interfaces" 2021-11-29 09:31:30 +00:00
Paul Hu
4724c6754b Merge "Simplify the permission update conditions" am: 5e3ef685ef am: 192f0c63f1 am: a08199b183
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903462

Change-Id: I3d916c0a5e9ae47ac6011ddba710e98874aadff1
2021-11-29 06:14:56 +00:00
Paul Hu
a08199b183 Merge "Simplify the permission update conditions" am: 5e3ef685ef am: 192f0c63f1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903462

Change-Id: I19beea0b0ae98c5456377aefa2cdc49dd95313f3
2021-11-29 06:03:15 +00:00
Paul Hu
192f0c63f1 Merge "Simplify the permission update conditions" am: 5e3ef685ef
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903462

Change-Id: I0e9774887d2c2cc1adf140d544457f07bca830b1
2021-11-29 05:46:14 +00:00
Paul Hu
5e3ef685ef Merge "Simplify the permission update conditions" 2021-11-29 05:31:14 +00:00
Paul Hu
0102c0fcfe Merge "Save uid netd network permissions" am: 6fafdc1548 am: b0a10cd127 am: 33c6908ef1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1773890

Change-Id: I5da3391ff6f1f8f51afc09e625c14b5cdd5dd659
2021-11-29 04:26:35 +00:00
Paul Hu
33c6908ef1 Merge "Save uid netd network permissions" am: 6fafdc1548 am: b0a10cd127
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1773890

Change-Id: Idb6fe861b24b628fb9e3eafeb7ca447f171b9e28
2021-11-29 03:58:01 +00:00
Paul Hu
b0a10cd127 Merge "Save uid netd network permissions" am: 6fafdc1548
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1773890

Change-Id: Ibff437f91017017cc6fcc7e456e621e2ad81995a
2021-11-29 03:45:46 +00:00
Paul Hu
6fafdc1548 Merge "Save uid netd network permissions" 2021-11-29 03:27:33 +00:00
paulhu
7bbffbd7d8 Simplify the permission update conditions
Bug: 192431153
Test: atest FrameworksNetTests
Change-Id: Ibef4f3b26932a3d12959e2e1d585e184a4ec73cb
2021-11-26 16:14:47 +08:00
paulhu
b2d5b054d3 Save uid netd network permissions
PermissionMonitor only saves netd network permissions by appId.
Then apply same permision to uids which are same appId. But
UIDS_ALLOWED_ON_RESTRICTED_NETWORKS can allow single uid has
restricted network permission. Thus, save the netd network
permissions by uid that can apply different permission to each
uid.

Bug: 192431153
Test: atest FrameworksNetTests
Change-Id: I942cbe0fa30758a7497c47a1b684ed70c4e3b09e
2021-11-26 14:47:01 +08:00
Aaron Huang
b7bd2083a9 Merge "Remove TODO that was already done" am: 93d437ba0c am: 2797722d0c am: 0c3fcb6aac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1900213

Change-Id: I871c4f73d972b65c21db5ab9640971ad802c51bf
2021-11-26 04:39:50 +00:00
Aaron Huang
0c3fcb6aac Merge "Remove TODO that was already done" am: 93d437ba0c am: 2797722d0c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1900213

Change-Id: Ie4b5d3356ee3e60c4b750456bce62a87a9ce8d40
2021-11-26 04:28:16 +00:00
Aaron Huang
2797722d0c Merge "Remove TODO that was already done" am: 93d437ba0c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1900213

Change-Id: Ie6370d66be8d4de22465b31be0b0eba680ed0a16
2021-11-26 04:16:55 +00:00
Treehugger Robot
6bf7af5452 Merge "Stop skipping VPN tests when running ADB over TCP." am: b031a2265e am: 8edbc35d56 am: dee59c5fa4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669610

Change-Id: Iaa43013f17c2ffded26527149721b1e60ca3ca88
2021-11-26 04:16:00 +00:00
Aaron Huang
93d437ba0c Merge "Remove TODO that was already done" 2021-11-26 04:00:44 +00:00