summaryrefslogtreecommitdiff
path: root/packages/Tethering/src
AgeCommit message (Collapse)Author
2020-11-13Merge SP1A.201105.002Scott Lobdell
Change-Id: Iec83a0c1f6f286a1e51abfc4356633ca9d8aea5f
2020-10-29Restructure Module code [ com.android.tethering ]Baligh Uddin
Code Migration from frameworks/base/packages/Tethering -> packages/modules/Connectivity/Tethering BUG: 167962976 Test: TH Change-Id: I2accb96abbdfa665ef34aa79e87af040226bcf32
2020-10-27Merge SP1A.201015.001Scott Lobdell
Change-Id: Ie33f12a2f4c73443640c28ad128be96b3533fd8c
2020-10-19Merge "Add the flag and default enable selectAllPrefixRange" am: 02fe8ac161 ↵Mark Chien
am: e9d354e7c7 am: a0f21001ea am: cb0b703b3c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461742 Change-Id: I232a3a52daeed69230215f3be135881415dbdb5c
2020-10-19Add the flag and default enable selectAllPrefixRangemarkchien
Also add MtsTetheringTest which only run if tethering mainline module is installed. Bug: 166057846 Bug: 170265597 Test: atest TetheringTests Change-Id: I434dda81eb5fab700d873a8ff3429b4222f0c7e6
2020-10-15Merge "Fix miss tracking downstream problem in PrivateAddressCoordinator" ↵Mark Chien
am: 613e6e3e9a am: 84b074eef8 am: 6574c6c8f9 am: 335c9c52d0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459887 Change-Id: I9262e13e3f3919c2b36bb8765a09c4abf2e31aa4
2020-10-15Fix miss tracking downstream problem in PrivateAddressCoordinatormarkchien
The downstream do not be tracked if PrivateAddressCoordinator just return cached address. Then, PrivateAddressCoordinator would not notify that downstream if conflict happen. Also remove the null check in getDownstreamPrefix because: - An IpServer is only added to mDownstreams by requestDownstreamAddress. - That method will only add the IpServer to mDownstreams if it has an IPv4 address. - As soon as that method returns, the IpServer sets mIpv4Address to the address that was returned. - When an IpServer is torn down, mIpv4Address is set to null after releaseDownstream is called. So it should never be possible for this to return null. Bug: 168169687 Test: atest CtsTetheringTest atest TetheringTests Change-Id: Ide5206b013acdc499344e1c839a830c5b245af41
2020-10-13Merge "Allow tethering pick prefix from all of private address range" am: ↵Mark Chien
5b976f3516 am: a303fc56ed am: 2408daf285 am: 52d3a00138 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436852 Change-Id: I849f7d336fd4bc7d39d8b268620bcb25dbd26667
2020-10-13Allow tethering pick prefix from all of private address rangemarkchien
Currently tethering only pick prefix from 192.168.0.0/16. There is no aviable tethering address if the upstream address is 192.168.x.y/16. This change allow tethering to pick prefix from any private address rnages. Now it still pick from 192.168.0.0/16 only to avoid behavior change. Will have follow up commit to change the configuration. Bug: 166057846 Bug: 170265597 Test: atest TetheringTests atest CtsTetheringTest Change-Id: Ib6304eb8b4788e9196d0af48e72f00a6bda73a5f
2020-10-09Merge SP1A.200921.001Scott Lobdell
Change-Id: I6a8d7215f874fed05e9fec71b17c8a3d1e2c94e0
2020-10-07Merge "Make the IP subnet persistent till reboot" am: 818da784dd am: ↵Mark Chien
fabe5787f0 am: 17c2040532 am: 78c744d29e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958 Change-Id: I8b109e26a043478b9058dbb058b65778259c496d
2020-10-06Make the IP subnet persistent till rebootmarkchien
Make the IP subnet persistent if it do not conflict with upstream. It allow client to reuse its IP that usually reduce DHCP procedure. Bug: 168169687 Test: atest TetheringTests Change-Id: Iddc5304730dce7b11c5d124b7eddce057d752bbd
2020-10-05Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740 am: ↵Treehugger Robot
004f473e97 am: 9cd671a4a2 am: e6e08b9836 am: a9bb7e8fff Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610 Change-Id: Ifb6e7159d4c45136414a9e1a9d0c8f05abdc1ecb
2020-10-05Merge "Make PrivateAddressCoordinator ignore vpn network"Treehugger Robot
2020-10-02Merge "Revert "Move module utils to the module package.""TreeHugger Robot
2020-10-01Revert "Move module utils to the module package."Hridya Valsaraju
Revert "Move util classes to their destination package" Revert "Move PacketReader and FdEventReader" Revert "Move static utils to a module package" Revert "Move static utils to a module package" Revert submission 12698912-move_packetreader Reason for revert: Broke presubmit on git_master, b/169861635 Reverted Changes: If5d1e4a58:Move module utils to the module package. I44ffaad3d:Move PacketReader and FdEventReader I93e9cfd96:Move util classes to their destination package Ia84d64130:Move static utils to a module package Iaac2810c7:Move static utils to a module package Change-Id: Ibbe59075cd7bc4c38e0707ea6ae3b3703b40986f
2020-09-30Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: 230fabb17e am: ↵Lorenzo Colitti
1569c71b07 am: 3616f6eced am: 3cae8eec79 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767 Change-Id: I6960604ea5fe5958906d9f62d0c5816d222a5b25
2020-09-30tethering: offload: Netlink Req NfGenTyler Wear
Add the netfilter generic message header to the netlink req. This is needed so the kernel won't ignore the request for invalid params. Bug: 149109043 Test: ConntrackSocketTest Change-Id: I1757fdeb11a0cac5821021a22323cbd74fe22bdc
2020-09-28Merge "Move module utils to the module package."Chalard Jean
2020-09-28Merge "Fix TetheredClient callback fail in InProcessTethering" am: ↵Treehugger Robot
3ed624fb2e am: 3b5d49b7bb am: 4ac111af72 am: 15ed18ed7e am: cf00541f63 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273 Change-Id: If84a7df3a08ebda9687bbd0481fddf0c87e33b58
2020-09-28Make PrivateAddressCoordinator ignore vpn networkmarkchien
If vpn app make its netmask as 0, PrivateAddressCoordinator would not able to find suitable address for tethering downstream. Since tethering do not support vpn as upstream, just ignore vpn in PrivateAddressCoordinator. Bug: 166365863 Test: atest TetheringTests atest CtsTetheringTest Change-Id: Iabe265467044fea9fa437674ca29ffc7bcdefe3b
2020-09-28Merge "Fix TetheredClient callback fail in InProcessTethering"Treehugger Robot
2020-09-26Move module utils to the module package.Chalard Jean
Test: builds Change-Id: If5d1e4a58fb2d6d9544e6d01995dabe445cf1f25 (cherry picked from commit 046bf639eb7728504be35e30e3dd49af3d029728)
2020-09-24Fix TetheredClient callback fail in InProcessTetheringmarkchien
TetheredClient callback would additional check whether caller has NETWORK_SETTINGS or {MAINLINE_}NETWORK_STACK permission, but it do not grant for self accessing. InProcessTethering run in system server, so the services in system server would fail to call TetheredClient callback. Grant permission for self process. Bug: 169231588 Test: atest CtsTetheringTest Change-Id: Ic04e44aef4df772c718ff25ed331bf02f5940c1d
2020-09-23Merge "tethering: DAD Proxy Daemon" am: 199613f2ef am: 692b986c12 am: ↵Remi NGUYEN VAN
0b1738fbd8 am: 804d99979a am: 444fb53d80 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645 Change-Id: I35ed011484134d1952fc5b4ba8d4ff766bfcb447
2020-09-23Merge "tethering: DAD Proxy Daemon"Remi NGUYEN VAN
2020-09-22tethering: DAD Proxy DaemonTyler Wear
DAD proxy daemon responsible for forwarding NS/NA between tethered iface and upstream iface. Change-Id: I2e58e10e7fa7dba6a6f63ad03b000549f3afc37e
2020-09-09Merge SP1A.200727.001Daniel Norman
Change-Id: Ibb86a528ed692cde325705779c7fa57e4b4de682
2020-08-31Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li
Bug: 166295507 Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27 Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-07Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: be00709344Chalard Jean
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497 Change-Id: Ia5e7e926bc3a9af8b03f8970738e6abe4c6d15b6
2020-08-07Revert "Revert "Move Inet[4]AddressUtils to libs/net""Chalard Jean
This patch is still needed and should go in now that the error is fixed. The patch was submitted into rvc-dev and is already in rvc-dev-plus-aosp (patch in in ag/11923559, revert skipped in ag/12072199). A follow-up will remove the unused services.net-module-wifi target. Test: originally tested in aosp/1324109 Test: m; manual: flashed, wifi and telephony working Test: atest NetworkStackCoverageTests Change-Id: I1074eedb0b0f156a1135e11210ec102de15ea674 Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
2020-08-05Merge "Allow wifi p2p to use legacy dedicated address" am: 5063505fab am: ↵Mark Chien
08feabb384 am: 3743623e44 am: 26d2720b6f am: f502f83e24 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398 Change-Id: I3d24b5c68ca741ee3f63bf60623ff7882ea9cc50
2020-08-05Merge "Allow wifi p2p to use legacy dedicated address" am: 5063505fab am: ↵Mark Chien
08feabb384 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398 Change-Id: Ica17499f82135bc96b87ca4071b603bb8cc23053
2020-08-05Merge "Allow wifi p2p to use legacy dedicated address"Mark Chien
2020-08-05Allow wifi p2p to use legacy dedicated addressmarkchien
Some exsting applications may expect wifi p2p use legacy "192.168.49.1/24" address. Have a configuration for wifi p2p to decide whether to use legacy dedicated address or random address. Bug: 161520826 Test: atest TetheringTests Change-Id: If79973416a6780ee19ee785c65772b1a2dc1fbf7
2020-07-31Merge "Update language to comply with Android's inclusive language guidance" ↵Chiachang Wang
am: 9352fceedb am: 36a22f06b1 am: d3843963b0 am: 31362db006 am: e2d7ea979f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618 Change-Id: Ib1c23f0a9758bdcf55d11ac67ff6ff54dc513066
2020-07-30Merge "Update language to comply with Android's inclusive language guidance" ↵Chiachang Wang
am: 9352fceedb am: 36a22f06b1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618 Change-Id: I8426e89337e60c48ad20677e835d36622d41ed91
2020-07-30Merge "Update language to comply with Android's inclusive language guidance"Chiachang Wang
2020-07-29Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: ↵Mark Chien
d2ca7e8b1e am: 136c4f98b4 am: 631cb3dcc8 am: e89b47f7a6 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217 Change-Id: I1ef0d35da436cc283ddc57daf5d8ec29f11db999
2020-07-29Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: ↵Mark Chien
d2ca7e8b1e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217 Change-Id: Ibb1c96fce2435fec3f678d89531ed10a6ddc784f
2020-07-29Update language to comply with Android's inclusive language guidanceChiachang Wang
See https://source.android.com/setup/contribute/respectful-code for reference. Test: m ; atest TetheringTests Bug: 161896447 Change-Id: Idc58697c72fb00896bee00185fefc50c1a24dd35
2020-07-29Always stop dhcp server even it is obsoletemarkchien
If dhcp server is obsolete, explicitly stop it to shut down its thread. Bug: 161418295 Test: atest CtsTetheringTest Change-Id: Ic5b876bd23711ec8d832879a7baee0495246b218
2020-07-03Align wigig tethering changes with upstreamLior David
The current code-base contain tethering support for wigig framework. Recently a simplified change was ported from upstream. Align the code to be consistent with the upstream change: - TETHERING_WIGIG is internal type, not public - Remove usage of system properties Change-Id: I171f2687fe3cafddcf7d39cd46ca7d060b52e747 CRs-Fixed: 2713745
2020-07-02Revert "Move Inet[4]AddressUtils to libs/net"Chalard Jean
This reverts commit 57d68e3c55176083ba40947be8f335534d958006. Reason for revert: Breaks the build b/160390899 Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b Change-Id: Ie10e66f61393602f17fbb61bf17230b176bf1f44
2020-07-02Move Inet[4]AddressUtils to libs/netRemi NGUYEN VAN
The classes should not be picked up from frameworks/base, as they are part of several mainline modules. Also refine comments in DhcpResults following feedback in previous change. (cherry-pick from internal branch skipping wifi classes; no other conflict) Bug: 151052811 Test: m; manual: flashed, wifi and telephony working Test: atest NetworkStackCoverageTests Merged-In: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
2020-06-29Merge RP1A.200629.001Daniel Norman
Change-Id: I00aef7c490f0420ab66d5f4ef8052bf6cb13bb66
2020-06-29Merge "Correct PendingIntent#getActivity() flags" am: 2063bec5c2 am: ↵Paul Hu
71eee20732 am: 429126464c am: d7638aecc2 am: b4226fe3e5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013 Change-Id: Ib65efbacaeae1c99c0d00c2bcf9f222bf9a32628
2020-06-29Merge "Correct PendingIntent#getActivity() flags" am: 2063bec5c2 am: 71eee20732Paul Hu
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013 Change-Id: I67e2d4facd77f978255a10423a9baff231ac0695
2020-06-29Merge "Correct PendingIntent#getActivity() flags"Paul Hu
2020-06-29Correct PendingIntent#getActivity() flagspaulhu
TetheringNotificationUpdater create a PendingIntent with Intent#FLAG_ACTIVITY_NEW_TASK flag. But this flag is used for Intent only. Thus, move this flag into Intent. Bug: 158639789 Test: atest TetheringTests Change-Id: I4c3af75c87b797bcde9356a94c835c7422dac1c6