Mark Chien
6f601a0374
Merge "Allow tethering pick prefix from all of private address range" am: 8c9a2645d8 am: 4388f63021 am: e2a905116c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436852
Change-Id: If37b6cdeb9d5573d1a6edc960bfc2a0a7404f73c
2020-10-13 14:30:17 +00:00
Mark Chien
e2a905116c
Merge "Allow tethering pick prefix from all of private address range" am: 8c9a2645d8 am: 4388f63021
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436852
Change-Id: Ie44f3b2ebfa51d2c915bd794b6ea0fade0098ecf
2020-10-13 14:01:47 +00:00
Mark Chien
4388f63021
Merge "Allow tethering pick prefix from all of private address range" am: 8c9a2645d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436852
Change-Id: Ief2520cd30059542ae3786a36b92198af6739a2a
2020-10-13 13:42:20 +00:00
Mark Chien
8c9a2645d8
Merge "Allow tethering pick prefix from all of private address range"
2020-10-13 13:12:58 +00:00
markchien
d9acdccbd3
Allow tethering pick prefix from all of private address range
...
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-13 16:45:09 +08:00
Remi NGUYEN VAN
0c083c9e2d
Merge "Use IpUtils, NetworkStackConstants in DadProxyTest" am: 80794b2476 am: d7b3661334 am: 371642a328
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440214
Change-Id: Id430f1fd9b0bfa1fff84bee48353b7c49e2b118b
2020-10-13 07:29:52 +00:00
Remi NGUYEN VAN
371642a328
Merge "Use IpUtils, NetworkStackConstants in DadProxyTest" am: 80794b2476 am: d7b3661334
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440214
Change-Id: I2eb8131309f397a832b16002f7eff702e78dba80
2020-10-13 07:12:10 +00:00
Remi NGUYEN VAN
d7b3661334
Merge "Use IpUtils, NetworkStackConstants in DadProxyTest" am: 80794b2476
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440214
Change-Id: I2e8d55b7984bccbd5959b7b00fa8c8b24acdb67c
2020-10-13 06:31:32 +00:00
TreeHugger Robot
3be56d09db
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 1b6030e24c -s ours am: 71572faaf2 -s ours
...
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803991
Change-Id: Icb052e904d339089be1b2e0014b7dd16f958e3d6
2020-10-13 04:22:42 +00:00
TreeHugger Robot
71572faaf2
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 1b6030e24c -s ours
...
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803991
Change-Id: I35256efaa6acc9a9f28371993587f888c1a77252
2020-10-13 03:51:03 +00:00
Remi NGUYEN VAN
71b9e93a83
Use IpUtils, NetworkStackConstants in DadProxyTest
...
The test had TODOs to address to use IpUtils and NetworkStackConstants
classes once they were moved to frameworks/libs/net. This is now done,
so using the new classes.
Bug: 158042941
Test: atest TetheringPrivilegedTests
Change-Id: I536b4506dbc3b42547ba9cb4e7c3c7a3e9459dd1
2020-10-13 11:30:03 +09:00
Xin Li
51ca8f56c5
Merge ab/6749736 in stage.
...
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
2020-10-10 20:38:57 -07:00
Remi NGUYEN VAN
1d0ddf081f
Merge "Move IpUtils to frameworks/libs/net" am: 4cb4ef8333 am: 9623f122df am: ff257a083e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: Ia364eb033d4ed9ae8db4f27fcfd065065581ae73
2020-10-09 01:26:33 +00:00
Remi NGUYEN VAN
ff257a083e
Merge "Move IpUtils to frameworks/libs/net" am: 4cb4ef8333 am: 9623f122df
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: I03872655d1ef3a7bb436666196ed67bd61601f65
2020-10-09 00:52:31 +00:00
Remi NGUYEN VAN
9623f122df
Merge "Move IpUtils to frameworks/libs/net" am: 4cb4ef8333
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: Ibd41a02a9a185667a7fe332213ef692c4d8bf515
2020-10-09 00:30:36 +00:00
Remi NGUYEN VAN
4cb4ef8333
Merge "Move IpUtils to frameworks/libs/net"
2020-10-09 00:13:40 +00:00
Mark Chien
acbdee3924
Merge "Make the IP subnet persistent till reboot" am: f052e40f79 am: 18b5773041 am: 4b52fef91d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958
Change-Id: I6d76e970384a3021e1fe519a268627628f45d446
2020-10-07 10:56:13 +00:00
Mark Chien
4b52fef91d
Merge "Make the IP subnet persistent till reboot" am: f052e40f79 am: 18b5773041
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958
Change-Id: Ib0d9e5b21b88fd352b06b3064ef3c34de4c046ce
2020-10-07 10:18:00 +00:00
Mark Chien
18b5773041
Merge "Make the IP subnet persistent till reboot" am: f052e40f79
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958
Change-Id: I0aaa978e8edd7e8666413fb18352fa83e9fb5469
2020-10-07 09:55:29 +00:00
Mark Chien
f052e40f79
Merge "Make the IP subnet persistent till reboot"
2020-10-07 09:39:29 +00:00
markchien
a2ffad84c7
Make the IP subnet persistent till reboot
...
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-06 20:25:19 +08:00
Anton Hansson
7276864ed9
Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7 am: adedc24110 am: 441eb20b82 am: ab60a44383
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635
Change-Id: Ifc3da9d4b1aa7699a5d3cb36e32d0f58c3062957
2020-10-05 13:50:38 +00:00
Anton Hansson
ab60a44383
Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7 am: adedc24110 am: 441eb20b82
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635
Change-Id: I63c4ad39ed92947aa925e5936a4d1f22669f00a1
2020-10-05 13:37:48 +00:00
Anton Hansson
441eb20b82
Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7 am: adedc24110
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635
Change-Id: Ifc377c2b8ba57bc14cfb6eb98d599e2496ef62f9
2020-10-05 13:10:31 +00:00
Anton Hansson
adedc24110
Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635
Change-Id: I6ef1bfbf4dcd39983e94207ff7f760e152da2a97
2020-10-05 12:56:06 +00:00
Anton Hansson
b8a342e4bc
Explicitly reference framework-wifi app build rule
...
This works around a build-system limitation where it does not know
which jars to feed r8 to resolve all classes during proguarding.
Bug: 160453030
Bug: 169931783
Test: build_mainline_modules.sh (with prebuilt sdk)
Change-Id: I3d9f2049cf898b5e551a5c5764df423abaa5e92d
Merged-In: I3d9f2049cf898b5e551a5c5764df423abaa5e92d
2020-10-05 11:43:39 +01:00
Treehugger Robot
c92ae41b1e
Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0b1e7d8956 am: 3f85eccfaa am: a089de8bab am: f572842106
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610
Change-Id: Id033b657976a0b29dad05f44a8f7117ada62b81d
2020-10-05 05:44:37 +00:00
Remi NGUYEN VAN
2494a06bb3
Move IpUtils to frameworks/libs/net
...
The utility classes are useful for mainline modules and their tests, for
example IpClientIntegrationTest.
Bug: 168868607
Test: m && atest NetworkStaticLibTests
Change-Id: If2b1613aa18a7990391e2d31cc2951ca93f1cf3c
2020-10-05 14:38:19 +09:00
Treehugger Robot
f572842106
Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0b1e7d8956 am: 3f85eccfaa am: a089de8bab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610
Change-Id: Idbbe5128c77d67040deb197e3437bf81abf8c1ad
2020-10-05 05:15:35 +00:00
Treehugger Robot
a089de8bab
Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0b1e7d8956 am: 3f85eccfaa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610
Change-Id: I70b49d0a10b80f378dcd2ba78b5bac848e40e5c9
2020-10-05 04:46:25 +00:00
Treehugger Robot
3f85eccfaa
Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0b1e7d8956
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610
Change-Id: I0a5398513c4572db839e3713109bb326f0261954
2020-10-05 04:26:10 +00:00
Treehugger Robot
0b1e7d8956
Merge "Make PrivateAddressCoordinator ignore vpn network"
2020-10-05 04:10:48 +00:00
Lorenzo Colitti
befc49ea1d
Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: f593d0eaa2 am: e8bbfd667b am: de14ddcb35
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767
Change-Id: Ie09b0bf8b8e4fa76c78187ed9915735944b05521
2020-09-30 14:32:48 +00:00
Lorenzo Colitti
de14ddcb35
Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: f593d0eaa2 am: e8bbfd667b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767
Change-Id: Ia2779a68a17225190222b56358d6ca13a97ea00a
2020-09-30 14:18:54 +00:00
Lorenzo Colitti
e8bbfd667b
Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: f593d0eaa2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767
Change-Id: I59f834071b66d310652016a626b0f8a6bb471d03
2020-09-30 13:53:31 +00:00
Lorenzo Colitti
f593d0eaa2
Merge changes I53ca4b98,I1757fdeb am: 3a463815e2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767
Change-Id: If1d0eb5a1818dd7a9346f8d0d64d5f37ea1b53c2
2020-09-30 13:14:23 +00:00
Lorenzo Colitti
c99ef48090
Fix OffloadHardwareInterfaceTest.
...
r.android.com/1424920 changed the code but forgot to update the
unit test.
Also fix some lint errors.
Bug: 149109043
Test: atest TetheringTests TetheringPrivilegedTests
Change-Id: I53ca4b9877dcb4a759dee6ec63133653315d826f
2020-09-30 17:04:19 +09:00
Tyler Wear
7f70074abc
tethering: offload: Netlink Req NfGen
...
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-30 15:07:47 +09:00
Treehugger Robot
f48195c89d
Merge "Fix TetheredClient callback fail in InProcessTethering" am: 18ee591257 am: 9fe2d11c12 am: 0c9a370cfc am: 513d2f34c5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273
Change-Id: I7109614a931e0ca7b19ca680cf4704385c611a01
2020-09-28 10:30:20 +00:00
Treehugger Robot
513d2f34c5
Merge "Fix TetheredClient callback fail in InProcessTethering" am: 18ee591257 am: 9fe2d11c12 am: 0c9a370cfc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273
Change-Id: I324a11ae925a120ad19d841fd7e136aa07607cd5
2020-09-28 10:07:50 +00:00
Treehugger Robot
0c9a370cfc
Merge "Fix TetheredClient callback fail in InProcessTethering" am: 18ee591257 am: 9fe2d11c12
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273
Change-Id: I8faacd26cc6f3e940af3a0147b84b693cb93503c
2020-09-28 09:50:14 +00:00
Treehugger Robot
9fe2d11c12
Merge "Fix TetheredClient callback fail in InProcessTethering" am: 18ee591257
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273
Change-Id: Ibb30260e9bc558ab0aa6dd8277dfd50efd14258f
2020-09-28 09:25:59 +00:00
markchien
1a2163b972
Make PrivateAddressCoordinator ignore vpn network
...
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-28 17:22:19 +08:00
Treehugger Robot
18ee591257
Merge "Fix TetheredClient callback fail in InProcessTethering"
2020-09-28 08:53:53 +00:00
Treehugger Robot
35e26a0675
Merge "Remove double check interface by NetworkInterface" am: f5096cc1e3 am: 2162a75d50 am: 155e2a5212 am: 11409a5b2f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440032
Change-Id: Ia64bbdfd6d7dfbd0801844db6d95ce88d4a008d5
2020-09-28 06:22:45 +00:00
Treehugger Robot
11409a5b2f
Merge "Remove double check interface by NetworkInterface" am: f5096cc1e3 am: 2162a75d50 am: 155e2a5212
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440032
Change-Id: Icaa939614857ff4adba9181b45480adb44b74fcf
2020-09-28 05:49:42 +00:00
Treehugger Robot
155e2a5212
Merge "Remove double check interface by NetworkInterface" am: f5096cc1e3 am: 2162a75d50
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440032
Change-Id: Idf1d18261c954e22989774ae97a12261551b31f6
2020-09-28 05:35:36 +00:00
Treehugger Robot
2162a75d50
Merge "Remove double check interface by NetworkInterface" am: f5096cc1e3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440032
Change-Id: Id8904075001709f2c62a55293f835c5a73ad9d79
2020-09-28 04:54:39 +00:00
Treehugger Robot
f5096cc1e3
Merge "Remove double check interface by NetworkInterface"
2020-09-28 04:21:28 +00:00
markchien
f609923b4b
Remove double check interface by NetworkInterface
...
NetworkInterface#getByName can not get the interface without IP addresses.
When setIncludeTestInterfaces(true) is called, the interface will be
placed in client mode, which will delete the link-local address. So calling
NetworkInterface#getByName to get test interface may not work before
switching to server mode.
Bug: 168215721
Test: atest CtsTethering
Change-Id: Ice8adcce1c4b2c86bd219c701b2afa9ba2339f24
2020-09-27 17:11:20 +08:00