Mark Chien
e77e08403c
[automerger skipped] Merge "Remove double check interface by NetworkInterface" into mainline-prod am: 9d881ec1ce -s ours
...
am skip reason: Change-Id Ice8adcce1c4b2c86bd219c701b2afa9ba2339f24 with SHA-1 f609923b4b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12785115
Change-Id: I97d222493d332f73096dc4bc36274039429e252f
2020-10-08 04:28:30 +00:00
Mark Chien
8ce54dcf31
[automerger skipped] Merge "Fix TetheredClient callback fail in InProcessTethering" into mainline-prod am: 19d19662f3 -s ours
...
am skip reason: Change-Id Ic04e44aef4df772c718ff25ed331bf02f5940c1d with SHA-1 84ec4a397a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12785116
Change-Id: I2b9b03b75c6b41532146a722a8fc4f8677b05729
2020-10-08 04:27:42 +00:00
Mark Chien
9d881ec1ce
Merge "Remove double check interface by NetworkInterface" into mainline-prod
2020-10-08 04:17:59 +00:00
Treehugger Robot
0afc3ce6a7
Fix TetheredClient callback fail in InProcessTethering
...
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
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273
Change-Id: I8faacd26cc6f3e940af3a0147b84b693cb93503c
Merged-In: Ic04e44aef4df772c718ff25ed331bf02f5940c1d
(cherry picked from commit 0c9a370cfc )
2020-10-07 17:46:29 +00:00
Treehugger Robot
b0cbf6f28e
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
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440032
Change-Id: Idf1d18261c954e22989774ae97a12261551b31f6
Merged-In: Ice8adcce1c4b2c86bd219c701b2afa9ba2339f24
(cherry picked from commit 155e2a5212 )
2020-10-07 17:44:55 +00:00
Mark Chien
7dc14ccfdf
Merge "Make the IP subnet persistent till reboot" am: f052e40f79 am: 18b5773041 am: 4b52fef91d am: acbdee3924
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958
Change-Id: I8b109e26a043478b9058dbb058b65778259c496d
2020-10-07 11:12:10 +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
09be21e265
[automerger skipped] Merge "Explicitly reference framework-wifi app build rule" am: c29f606cc7 am: adedc24110 am: 441eb20b82 am: ab60a44383 am: 7276864ed9 -s ours
...
am skip reason: Change-Id I3d9f2049cf898b5e551a5c5764df423abaa5e92d with SHA-1 20dd58aa8d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635
Change-Id: If3a0e1416ee61dc030048fc6e0a61d38ef5f4384
2020-10-05 14:23:55 +00: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
d594552cd9
Explicitly reference framework-wifi app build rule am: 20dd58aa8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12752580
Change-Id: Ic9cbad0d25c589bf51dfef0e48ca41aca51fa450
2020-10-05 10:53:46 +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
9faf2c5b2a
Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0b1e7d8956 am: 3f85eccfaa am: a089de8bab am: f572842106 am: c92ae41b1e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610
Change-Id: Ifb6e7159d4c45136414a9e1a9d0c8f05abdc1ecb
2020-10-05 05:57:55 +00: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
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
Anton Hansson
20dd58aa8d
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
2020-10-02 16:38:21 +01:00
TreeHugger Robot
0e2d8592ad
Merge "Revert "Move module utils to the module package.""
2020-10-02 03:54:37 +00:00
Hridya Valsaraju
3d57544fb2
Revert "Move module utils to the module package."
...
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-10-01 20:12:46 +00:00
Lorenzo Colitti
74f96cb61a
Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: f593d0eaa2 am: e8bbfd667b am: de14ddcb35 am: befc49ea1d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767
Change-Id: I6960604ea5fe5958906d9f62d0c5816d222a5b25
2020-09-30 14:33:32 +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
Chalard Jean
66a2d7bac8
Merge "Move module utils to the module package."
2020-09-28 13:22:23 +00:00
Treehugger Robot
03eba4d9b4
Merge "Fix TetheredClient callback fail in InProcessTethering" am: 18ee591257 am: 9fe2d11c12 am: 0c9a370cfc am: 513d2f34c5 am: f48195c89d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273
Change-Id: If84a7df3a08ebda9687bbd0481fddf0c87e33b58
2020-09-28 10:50:33 +00: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
f58088e557
Merge "Remove double check interface by NetworkInterface" am: f5096cc1e3 am: 2162a75d50 am: 155e2a5212 am: 11409a5b2f am: 35e26a0675
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440032
Change-Id: Ic411fd07e82029fb3bb557912481af1170d310d0
2020-09-28 06:50:57 +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
Chalard Jean
050d4a4bb0
Move module utils to the module package.
...
Test: builds
Change-Id: If5d1e4a58fb2d6d9544e6d01995dabe445cf1f25
(cherry picked from commit 046bf639eb7728504be35e30e3dd49af3d029728)
2020-09-26 14:12:10 +09:00