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
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
Treehugger Robot
18ee591257
Merge "Fix TetheredClient callback fail in InProcessTethering"
2020-09-28 08:53:53 +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
Remi NGUYEN VAN
3065a5df85
Merge "Remove unused testutils lib from tethering tests" am: a8e68bb723 am: d8c1f0dc19 am: a3de2aa6d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924
Change-Id: Ib7d695934eb69c8e49e690d3d85198cf6f7b9ff4
2020-09-24 09:12:13 +00:00
Remi NGUYEN VAN
a3de2aa6d3
Merge "Remove unused testutils lib from tethering tests" am: a8e68bb723 am: d8c1f0dc19
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924
Change-Id: I7229dab0c6246f9fbb6724456d9ada6064d3f31a
2020-09-24 08:52:46 +00:00
Remi NGUYEN VAN
d8c1f0dc19
Merge "Remove unused testutils lib from tethering tests" am: a8e68bb723
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924
Change-Id: I30a1542c1fe2056d074402f2b5f7be2a37f15373
2020-09-24 08:35:35 +00:00
Remi NGUYEN VAN
a8e68bb723
Merge "Remove unused testutils lib from tethering tests"
2020-09-24 08:16:21 +00:00
markchien
84ec4a397a
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
Change-Id: Ic04e44aef4df772c718ff25ed331bf02f5940c1d
2020-09-24 10:11:51 +08:00
Remi NGUYEN VAN
8f59ec090d
Remove unused testutils lib from tethering tests
...
frameworks-base-testutils is unused in tethering integration tests, so
the dependency can be removed.
That test library also contains test classes, so removing the dependency
allows tethering tests to stop running the associated tests.
Also add jarjar rules to the unit tests to zap (remove) the test classes
from the output APK. Ideally the unit tests should stop depending on
that library too (TestableLooper can be used instead of TestLooper), or
the frameworks-base-testutils library should stop including test
classes.
Bug: 167968946
Test: m CtsTetheringTest TetheringTests
Change-Id: Ie950ce5b6181e388a7f71da430fd2dd8ada32e49
2020-09-23 17:10:42 +09:00
Remi NGUYEN VAN
149bcd9a8d
Merge "tethering: DAD Proxy Daemon" am: 72e81859f8 am: 4508ee1e28 am: fa3997133c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645
Change-Id: I308a9f5ba1b77fe1c3263a610354d76dc8b127ae
2020-09-23 06:19:15 +00:00
Remi NGUYEN VAN
fa3997133c
Merge "tethering: DAD Proxy Daemon" am: 72e81859f8 am: 4508ee1e28
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645
Change-Id: I25eb7ff486716156a11cfd4b1f15e789ce154a7c
2020-09-23 05:48:57 +00:00
Remi NGUYEN VAN
4508ee1e28
Merge "tethering: DAD Proxy Daemon" am: 72e81859f8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645
Change-Id: Ib3bbe465b698feace1a3ec1f6588cfa7bff0c9fd
2020-09-23 05:30:55 +00:00
Remi NGUYEN VAN
72e81859f8
Merge "tethering: DAD Proxy Daemon"
2020-09-23 04:57:42 +00:00
Tyler Wear
90e4063fd2
tethering: DAD Proxy Daemon
...
DAD proxy daemon responsible for forwarding NS/NA between
tethered iface and upstream iface.
Change-Id: I2e58e10e7fa7dba6a6f63ad03b000549f3afc37e
2020-09-22 11:58:49 -07:00
Bill Yi
90ba8b743e
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 8c7f330e7a am: 6dbeee66e9 -s ours am: e1d6cd570c -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I18f6dabacb6e272e2d3fdf63a9220afc5572f2d2
2020-09-19 07:01:25 +00:00
Bill Yi
0b754492ac
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59 am: 1138d178c4 -s ours am: 9dce16d237 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Ib3e8b5c0678513b5128aaf106c8f8044bed09702
2020-09-19 07:00:58 +00:00
Bill Yi
e1d6cd570c
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 8c7f330e7a am: 6dbeee66e9 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16
2020-09-19 05:51:33 +00:00
Bill Yi
9dce16d237
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59 am: 1138d178c4 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3
2020-09-19 05:50:36 +00:00
Bill Yi
6dbeee66e9
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 8c7f330e7a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Iaa631aaca21a51d786f59801d317f27ee635c70f
2020-09-19 05:25:29 +00:00
Bill Yi
1138d178c4
Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e
2020-09-19 05:22:39 +00:00
Bill Yi
8c7f330e7a
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
2020-09-18 18:47:48 +00:00
Nucca Chen
4286c98bb1
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: a0d6f9712b am: b463014633
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: I248a1e3d9aad6a1f632898faa59953f29ba14f5f
2020-09-18 05:36:25 +00:00
Bill Yi
725af62a59
Merge mainline-release 6664920 to master - DO NOT MERGE
...
Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4
2020-09-17 21:56:59 -07:00
Nucca Chen
b463014633
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: a0d6f9712b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: Ic90ce1bc5a5abd1eb515e5392b2980cdd001dc9f
2020-09-18 04:56:57 +00:00
Nucca Chen
a0d6f9712b
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: Ia0b8a185f44dac7db365fcb9fc865a82bd552d62
2020-09-18 04:27:28 +00:00
Hungming Chen
56c632caed
Move BPF offload program from netd to mainline
...
Test: as the follows.
$ adb shell ls sys/fs/bpf | grep offload
map_offload_tether_ingress_map
map_offload_tether_limit_map
map_offload_tether_stats_map
prog_offload_schedcls_ingress_tether_ether
prog_offload_schedcls_ingress_tether_rawip
$ adb shell dumpsys netd --short
TetherController
BPF ingress map: iif(iface) v6addr -> oif(iface) srcmac ..
13(rmnet_data3) 2401:e180:8842:6e3:bc6a:2e45:c30:f418 -> ..
BPF stats (downlink): iif(iface) -> packets bytes errors
13(rmnet_data3) -> 7 488 0
BPF limit: iif(iface) -> bytes
13(rmnet_data3) -> 9223372036854775807
Log:
bpfloader: Loaded object: /apex/com.android.tethering/etc/bpf/offload.o
Change-Id: I71b7efb1f4bd6eb1cd469a0e1e4a56342dc6e579
2020-09-16 20:38:14 +08:00
Bill Yi
509872d525
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 38436142ff -s ours
...
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb
2020-09-14 21:50:56 +00:00
Bill Yi
38436142ff
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours
...
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I9b5e1a916081cb266eaca328b86506481e938c7f
2020-09-14 21:18:54 +00:00
Bill Yi
8780ad918d
Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6
Change-Id: If78e130888b8d4653ef128d747e18cc46844d732
2020-09-13 07:58:42 -07:00
Xin Li
d0d979b032
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: b7fcf57c8d -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae
2020-09-11 03:33:28 +00:00
Xin Li
b7fcf57c8d
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: Ie915db11679ce05f5d37815028015f61ffb1a4a6
2020-09-11 02:02:37 +00:00
Xin Li
3b8bfc4811
Merge Android R
...
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
2020-09-09 20:21:10 -07:00
Anton Hansson
4900454137
Merge "Simplify module visibility post build refactor" into stage-aosp-master am: f94c8eb54f am: 6ab81ec60a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513172
Change-Id: Ibdfa0189a9b7608dfcfe3a40ed3fd84150372c19
2020-09-07 09:02:10 +00:00
Anton Hansson
6ab81ec60a
Merge "Simplify module visibility post build refactor" into stage-aosp-master am: f94c8eb54f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513172
Change-Id: Iff37388324c3fb1e838c3c7ffc803b96d6e61197
2020-09-07 08:22:05 +00:00
Anton Hansson
f94c8eb54f
Merge "Simplify module visibility post build refactor" into stage-aosp-master
2020-09-07 08:09:53 +00:00
Anton Hansson
9aed13818c
Simplify module visibility post build refactor
...
//visibility:override is no longer needed for impl_library_visibility
to override visibility.
Removing this allows the defaults module to specify better defaults.
- Stub libraries are made publicly visible, via `visibility`
- Impl libraries are private by default, but visibility is extended
by the modules
Bug: 165017290
Test: m
Exempt-From-Owner-Approval: build refactor
Change-Id: Ibf35bfac5c99a21125f89ba10945f3364217b90f
2020-09-07 07:54:50 +00:00
Treehugger Robot
539f9c66da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5db7c0028c -s ours am: 097abd5f98 -s ours am: c6ac3642f3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007
Change-Id: I6a579c24192f0b36ea79732560f39684d27a1c90
2020-09-06 07:11:17 +00:00
Treehugger Robot
c6ac3642f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5db7c0028c -s ours am: 097abd5f98 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007
Change-Id: I7815cf85faa06b0331044e5b4ffd2561d2ec97c1
2020-09-06 06:49:13 +00:00
Treehugger Robot
097abd5f98
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5db7c0028c -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007
Change-Id: I9102a96a0cb816b895ccf93a174dc6e91e59ee5a
2020-09-06 06:40:58 +00:00