LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,470 Commits 2 Branches 0 Tags
bc08ba8b3b43232ea39ae2bc8d3b91637688521b
Commit Graph

10470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
bc08ba8b3b Merge "Fix fd leak in KeepaliveTracker." am: c6a527351f am: 759c08d0f4 am: 93e0ec070a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1361907

Change-Id: I69f4f8073b057f294e0665ab7b1dcf57818d3089
 2020-08-07 06:17:00 +00:00
Lorenzo Colitti
93e0ec070a Merge "Fix fd leak in KeepaliveTracker." am: c6a527351f am: 759c08d0f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1361907

Change-Id: I68dcb3da95c803179733861604e092582eefb254
 2020-08-07 06:02:12 +00:00
Lorenzo Colitti
759c08d0f4 Merge "Fix fd leak in KeepaliveTracker." am: c6a527351f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1361907

Change-Id: I13df61b292a9ec964854641ba170d39caf66125a
 2020-08-07 05:48:00 +00:00
Lorenzo Colitti
c6a527351f Merge "Fix fd leak in KeepaliveTracker." 2020-08-07 05:40:33 +00:00
Josh Gao
bd97cc8ebf Fix fd leak in KeepaliveTracker. 
The semantics of FileDescriptor in AIDL are that the callee must close
the file descriptor it receives manually.

Bug: http://b/157789860
Test: treehugger
Change-Id: Ice9fc9abe2959a84ad138a95c900dff676653665
 2020-08-07 03:22:38 +00:00
Chalard Jean
0bfc7ad392 Merge "Resolve the endpoint in legacy VPN" am: c0f31b35d0 am: 0317f66f27 am: 1b74706c24 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382496

Change-Id: I96691f6091c43377f23a00621242ed034fcb0444
 2020-08-06 16:35:54 +00:00
Chalard Jean
e2bfd0071b Merge "Add a test for starting the legacy VPN." am: c029c1e928 am: 0cc2c0d906 am: 48ac26604f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372896

Change-Id: I3c4a94181bd71df68121fa0f71669fa4fa588bdd
 2020-08-06 16:35:30 +00:00
Chalard Jean
1b74706c24 Merge "Resolve the endpoint in legacy VPN" am: c0f31b35d0 am: 0317f66f27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382496

Change-Id: If649ab2763c9971c25af7732b32e97bfd50fb6f0
 2020-08-06 16:06:20 +00:00
Chalard Jean
48ac26604f Merge "Add a test for starting the legacy VPN." am: c029c1e928 am: 0cc2c0d906 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372896

Change-Id: Idc49c61cc0547cdabe37cfa19b685c2beeda473b
 2020-08-06 16:06:08 +00:00
Chalard Jean
0317f66f27 Merge "Resolve the endpoint in legacy VPN" am: c0f31b35d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382496

Change-Id: I732bb2282cf5b4ba74653ecc0bd934bf991649de
 2020-08-06 13:10:36 +00:00
Chalard Jean
0cc2c0d906 Merge "Add a test for starting the legacy VPN." am: c029c1e928 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372896

Change-Id: I31352ae32ddeba4a37cc37bdcf6d7568f63fd70a
 2020-08-06 13:10:20 +00:00
Chalard Jean
c0f31b35d0 Merge "Resolve the endpoint in legacy VPN" 2020-08-06 12:51:50 +00:00
Chalard Jean
c029c1e928 Merge "Add a test for starting the legacy VPN." 2020-08-06 12:50:50 +00:00
Chalard Jean
180d580dc2 Resolve the endpoint in legacy VPN 
This adds code to resolve the endpoint in the legacy VPN
runner if it was specified as a hostname, and enables the
previously added test that was disabled because this was
broken until this patch. See the linked bug for details.

This patch uses the async DNS API to do the resolution.
This lets the resolution be fully cancellable, though the
code is more complex than with the non-interruptible
getByName.

Test: VpnTest and in particular VpnTest#testStartRacoon
      Fixes the test meant to test this
      Also manual testing that resolution of a real
      hostname works as expected, that failure to resolve
      returns correctly, and that cancellation/interruption
      will unblock the thread and terminate immediately.
Bug: 158974172
Change-Id: I714985f3c7919dad9c1854830c50f29c1f94a21e
 2020-08-06 17:29:59 +09:00
Chalard Jean
ceacf96547 Add a test for starting the legacy VPN. 
The legacy VPN has, among many parameters, a host to connect to.
This host can be specified as a numeric address, or as a hostname.
When it's a name, resolution is required. Currently, name
resolution is performed by the native VPN daemons racoon and
mtpd. When a hostname is used, the framework does not know the
IP address of the VPN server and does not add a throw route for
the VPN server IP address. On older kernels this does not matter
because the legacy PPP kernel code binds the PPP socket to the
right network, but on newer devices that use the upstream PPP
code, this does not work. See b/133797637.

This patch instruments the legacy VPN code so that it can be
run in tests, and uses this instrumentation to simulate passing
a configuration that contains a host, and verifies that the
arguments passed to the mptd and racoon daemons receive the
expected server address, and that the expected throw route is
correctly installed.
It then adds two tests : one specifying the server as a numeric
address, and one as a hostname. As the resolution is currently
broken, the latter of these tests is added disabled, and the
followup fix to the issue enables it.

This test is basic and very targeted, but it's what we need right
now. Also there are plans to remove this entire code path in S, so
the test being ad-hoc is not much of a problem.

Test: this
Bug: 158974172
Change-Id: I420b63db03a58e8c67a98a85c9f4c2d6ed7ad078
(cherry picked from commit 45846a03051a13d667732288e457eab4336a691e)
 2020-08-06 17:16:00 +09:00
Automerger Merge Worker
32d5d87fb2 Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: 3ca65c6b2b -s ours" into rvc-dev-plus-aosp am: 4f547ed394 -s ours 
am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 862858dc88 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380906

Change-Id: I0f2f489b8b6cddfbf86838e0acf48857fe740a6f
 2020-08-03 21:50:57 +00:00
Alex Light
a67193d103 [automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: 3ca65c6b2b -s ours 
am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 862858dc88 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380906

Change-Id: I267d10e1c9875e011c474ac1911a5a737cb3a86f
 2020-08-03 21:25:57 +00:00
Alex Light
3ca65c6b2b Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380906

Change-Id: Id2829bcdfb836db02db9842bb250e2eb628495aa
 2020-08-03 21:01:33 +00:00
Alex Light
ed78646808 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162536543
Test: Treehugger
Change-Id: I971050a2665c177870ff257bd0f41343db702892
Merged-In: I971050a2665c177870ff257bd0f41343db702892
 2020-08-03 17:04:58 +00:00
TreeHugger Robot
19eb130f02 Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: fd5ab3e01b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282658

Change-Id: I439c446bcd55b35ec41d7c4f76a53e39de5cdd4e
 2020-08-03 16:17:14 +00:00
TreeHugger Robot
fd5ab3e01b Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp 2020-08-03 15:49:46 +00:00
Paul Hu
0f9b51cb06 Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8 am: 296741de68 am: 715a48b386 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322

Change-Id: I3a376716eb2e3d25aa60921265ffbe3dc8f093a6
 2020-08-03 11:43:15 +00:00
Paul Hu
715a48b386 Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8 am: 296741de68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322

Change-Id: Id91c6de75e524080d15e2508007d5de997c7fd92
 2020-08-03 11:18:31 +00:00
Paul Hu
296741de68 Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322

Change-Id: I54758c3e9ec37c68d45360afb10a322f749564a9
 2020-08-03 10:56:42 +00:00
Paul Hu
cb4e4712b8 Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" 2020-08-03 10:37:52 +00:00
Alex Light
862858dc88 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162536543
Test: Treehugger
Change-Id: I971050a2665c177870ff257bd0f41343db702892
 2020-07-31 08:18:33 -07:00
Peter Wang
b85be85697 [automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 617ea90340 am: b882e3f391 -s ours am: a70fc1011e -s ours 
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749

Change-Id: Ic15254afce6f13f0553faf9ec98fc16fe9563c81
 2020-07-31 09:55:23 +00:00
Peter Wang
a70fc1011e [automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 617ea90340 am: b882e3f391 -s ours 
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749

Change-Id: I1e06f6cdb0e69e06cf94a543eec83478dabeda14
 2020-07-31 09:34:47 +00:00
Peter Wang
b882e3f391 Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 617ea90340 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749

Change-Id: I43a19b479d4c77bb19af31381e7d998527bc068a
 2020-07-31 09:04:43 +00:00
Peter Wang
617ea90340 Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" 2020-07-31 08:43:44 +00:00
Chalard Jean
475d83afd8 Merge "Move utils from network stack to libs." am: 21be4fabb5 am: d065a0a4e6 am: 642beae1fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083

Change-Id: I56d148261c5fe94264ff0a68e87020329d06b857
 2020-07-31 01:12:13 +00:00
Chalard Jean
642beae1fd Merge "Move utils from network stack to libs." am: 21be4fabb5 am: d065a0a4e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083

Change-Id: Ia163bc416e16ce56fc96855c1111a9905b712843
 2020-07-31 01:09:46 +00:00
Chalard Jean
d065a0a4e6 Merge "Move utils from network stack to libs." am: 21be4fabb5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083

Change-Id: I846dae9b7e36ddf6360bb946cc07beb8c44a34a5
 2020-07-31 00:53:12 +00:00
Chalard Jean
2156153db4 Move utils from network stack to libs. 
This package is using some common utilities from
a library that used to live in the network stack.
A better home for these utilities is frameworks/libs,
so this topic moves the files ther and also changes
the package of some utilities.

See aosp/1350222 and aosp/1350182 for a detailed
description of the specific files that moved.

Test: checkbuild
Change-Id: I76a9b7790f3997e3e6b3c2f75ba6308286457cde
 2020-07-29 21:15:48 +09:00
paulhu
bfa9f182b0 [RFPM04] Adjust hasRestrictedNetworkPermission method 
There are two parts in hasRestrictedNetworkPermission method.
One is carryover package check and one is uid permission
check. Seperate carryover package check part to another method
to be clearer the usage of hasRestrictedNetworkPermission method.

Bug: 132784544
Test: atest FrameworksNetTests
Change-Id: Iab0609fcaa52acb0dfcb31ca957f22bfe8d62392
 2020-07-29 14:14:27 +08:00
Paul Hu
405271b652 Merge "[RFPM03] Check permission by uid." am: 629f681106 am: 31dd6c3fd7 am: d091e8ff6e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375

Change-Id: I35df9a8bb721f1303f351dbb115b09e911ea9a69
 2020-07-29 06:13:35 +00:00
Paul Hu
d091e8ff6e Merge "[RFPM03] Check permission by uid." am: 629f681106 am: 31dd6c3fd7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375

Change-Id: I80406643e4797b1e269b4f7c5711339371fa533b
 2020-07-29 05:53:25 +00:00
Paul Hu
31dd6c3fd7 Merge "[RFPM03] Check permission by uid." am: 629f681106 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375

Change-Id: I520b5d271d6d5214653ebaaeb5d6713c191b911d
 2020-07-29 05:47:15 +00:00
Paul Hu
629f681106 Merge "[RFPM03] Check permission by uid." 2020-07-29 05:41:32 +00:00
Junyu Lai
811fee2a2a Merge "Gracefully handle integer overflows." am: 71fdf4ab8d am: 10c70fd2dd am: 42a12b57f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217

Change-Id: I9cde0d9e70b389b91bde9b3384f82887259c9c74
 2020-07-29 02:14:58 +00:00
Junyu Lai
42a12b57f2 Merge "Gracefully handle integer overflows." am: 71fdf4ab8d am: 10c70fd2dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217

Change-Id: I0bba17d0367ebf4e1c868a8cc7471366bc7a4408
 2020-07-29 01:55:23 +00:00
Junyu Lai
10c70fd2dd Merge "Gracefully handle integer overflows." am: 71fdf4ab8d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217

Change-Id: I779298886cfaef330b433fea6009860682df35bd
 2020-07-29 01:37:48 +00:00
Junyu Lai
71fdf4ab8d Merge "Gracefully handle integer overflows." 2020-07-29 01:19:07 +00:00
Lorenzo Colitti
d0b692037e Set the NetworkInfo subtype to 0. am: d287e8535d am: f8f651ca6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826

Change-Id: I6b8d22c0bf3a19f8c661e67454f80ae55f466842
 2020-07-28 18:28:43 +00:00
Lorenzo Colitti
020047560d Set the NetworkInfo subtype to 0. am: d287e8535d am: 85512cbf64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826

Change-Id: I8a54c8fa4c51d74f6e8b1dc98dad71208f4e3836
 2020-07-28 18:27:25 +00:00
Lorenzo Colitti
f8f651ca6a Set the NetworkInfo subtype to 0. am: d287e8535d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826

Change-Id: Ida8cd0788ae34f4861fbcb958163b5074258c6ac
 2020-07-28 18:05:15 +00:00
Lorenzo Colitti
85512cbf64 Set the NetworkInfo subtype to 0. am: d287e8535d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826

Change-Id: If570350574c5113763bb86943a27b9330db6b9ad
 2020-07-28 18:05:12 +00:00
Chiachang Wang
0b63167552 Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad am: 261dd20290 am: f61e400585 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160

Change-Id: I2efddd398c4d7cf4d65f1c76c399a3a07a843889
 2020-07-28 11:31:06 +00:00
Chiachang Wang
f61e400585 Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad am: 261dd20290 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160

Change-Id: I9318abb0233e7b8847466914724eeaae769ea9c8
 2020-07-28 11:19:47 +00:00
Chiachang Wang
261dd20290 Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160

Change-Id: Ifcb4682d75b8df577281030c58b61eff53e6ae20
 2020-07-28 11:04:20 +00:00