Commit Graph

1954 Commits

Author SHA1 Message Date
TreeHugger Robot
8d071edd2e [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 am: c6298512e4 -s ours am: 8188870684 -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 7c538fa7ff is in history

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

Change-Id: I55397954c2c6ce08a9e12fb97191a52d70dde662
2020-06-10 07:16:51 +00:00
Lorenzo Colitti
51428d92bb [automerger skipped] [BOT.9] Add unit test for data warning in BpfCoordinator am: 1aa15dab62 am: 40e28391e5 -s ours am: e7b6ad5bfc -s ours
am skip reason: Change-Id Ic1f37de75b064d7c8717e1b496e13174bb8693ec with SHA-1 1aa15dab62 is in history

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

Change-Id: I67abeb69d2c2cada76925e2baa455d2a0664b443
2020-06-10 07:16:48 +00:00
Lorenzo Colitti
3b580215b4 [automerger skipped] [BOT.4] Make BpfCoordinator to support data warning am: 11b88351c0 am: d0ca099573 -s ours am: 1d7c1bded8 -s ours
am skip reason: Change-Id Ibf25560ca2e9f003d8eba01361dc7d35ec1b1627 with SHA-1 11b88351c0 is in history

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

Change-Id: I534b4dd25d3e7ad03bdb288974a797ffe368c79a
2020-06-10 07:16:45 +00:00
Hungming Chen
ada520f82c [automerger skipped] [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: 810a381cd4 am: 41c971a024 -s ours am: 2496028dee -s ours
am skip reason: Change-Id I85316ef09ff3c9389ded11dcc384493d699da48e with SHA-1 810a381cd4 is in history

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

Change-Id: Id263d81a1bd29657ae7a043873a667cde77d4f2d
2020-06-10 07:16:37 +00:00
Hungming Chen
c54a0c2a93 [automerger skipped] [BOT.3] Add unit test for polling network stats in the coordinator am: 6442858f9d am: a2f02c617e -s ours am: 8d4bbf4f2f -s ours
am skip reason: Change-Id Ib1756159a2047c5db7d31359b0f288f840bd1bb1 with SHA-1 6442858f9d is in history

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

Change-Id: I169707611da026910740c6385bcc938bfac5dbeb
2020-06-10 07:16:34 +00:00
Hungming Chen
82269fdb2c [automerger skipped] [BOT.2] Create a coordinator and stats provider to provide tether stats am: d50f53b58a am: 81d15877d4 -s ours am: 9269de4a72 -s ours
am skip reason: Change-Id I22e71f87b67668f7e733e4f215d93bf5b2c9380d with SHA-1 d50f53b58a is in history

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

Change-Id: I632ab139fd24dfaeafb1f8bc17ac6006fc491d0d
2020-06-10 07:16:23 +00:00
Hungming Chen
8637dd3b14 [automerger skipped] [BOT.1] Add a class ForwardedStats in TetheringUtils am: 020cb554f5 am: 3b29ab8c1b -s ours am: fa2109f84a -s ours
am skip reason: Change-Id Ie8725f95c3ddd5fb3811d479de32d2c1f7dcb493 with SHA-1 020cb554f5 is in history

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

Change-Id: I1868177c54775d174936ba1d9452b9b6e93139b5
2020-06-10 07:16:16 +00:00
TreeHugger Robot
a046f97ad2 [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 -s ours am: ea022aada2 -s ours am: 9cff08e68b -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 269c0886ed is in history

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

Change-Id: Iaf86a3e7e662be202e0ccfa4dfeb6edf9f9ccf5e
2020-06-10 07:14:41 +00:00
TreeHugger Robot
8188870684 [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 am: c6298512e4 -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 7c538fa7ff is in history

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

Change-Id: I3ed8753a3636e54d5e9c86b14a642f8bff62307d
2020-06-10 07:04:31 +00:00
Lorenzo Colitti
e7b6ad5bfc [automerger skipped] [BOT.9] Add unit test for data warning in BpfCoordinator am: 1aa15dab62 am: 40e28391e5 -s ours
am skip reason: Change-Id Ic1f37de75b064d7c8717e1b496e13174bb8693ec with SHA-1 1aa15dab62 is in history

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

Change-Id: I9d2bfe44f055fd813a0a9284117ee14fbde72b9d
2020-06-10 07:04:28 +00:00
Lorenzo Colitti
1d7c1bded8 [automerger skipped] [BOT.4] Make BpfCoordinator to support data warning am: 11b88351c0 am: d0ca099573 -s ours
am skip reason: Change-Id Ibf25560ca2e9f003d8eba01361dc7d35ec1b1627 with SHA-1 11b88351c0 is in history

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

Change-Id: I807b6c43b359acc8079fe08de23dcdda2ad50c66
2020-06-10 07:04:24 +00:00
Hungming Chen
2496028dee [automerger skipped] [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: 810a381cd4 am: 41c971a024 -s ours
am skip reason: Change-Id I85316ef09ff3c9389ded11dcc384493d699da48e with SHA-1 810a381cd4 is in history

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

Change-Id: I4766b5518c21c2d1d69c365035530bdbe1d39b57
2020-06-10 07:04:20 +00:00
Hungming Chen
8d4bbf4f2f [automerger skipped] [BOT.3] Add unit test for polling network stats in the coordinator am: 6442858f9d am: a2f02c617e -s ours
am skip reason: Change-Id Ib1756159a2047c5db7d31359b0f288f840bd1bb1 with SHA-1 6442858f9d is in history

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

Change-Id: Idec97ca9bda2f0f1d35605a58cfd480ef289b087
2020-06-10 07:04:11 +00:00
Hungming Chen
9269de4a72 [automerger skipped] [BOT.2] Create a coordinator and stats provider to provide tether stats am: d50f53b58a am: 81d15877d4 -s ours
am skip reason: Change-Id I22e71f87b67668f7e733e4f215d93bf5b2c9380d with SHA-1 d50f53b58a is in history

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

Change-Id: Icaf300354c46be86ded8e61f5710d9cf8237820d
2020-06-10 07:04:06 +00:00
Hungming Chen
fa2109f84a [automerger skipped] [BOT.1] Add a class ForwardedStats in TetheringUtils am: 020cb554f5 am: 3b29ab8c1b -s ours
am skip reason: Change-Id Ie8725f95c3ddd5fb3811d479de32d2c1f7dcb493 with SHA-1 020cb554f5 is in history

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

Change-Id: I4b83375e92077a3657f2ead9953765c13ac39e51
2020-06-10 07:03:57 +00:00
TreeHugger Robot
9cff08e68b [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 -s ours am: ea022aada2 -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 269c0886ed is in history

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

Change-Id: I45b4d22af8275d69c045fe7a6705381e3394ca14
2020-06-10 07:03:06 +00:00
TreeHugger Robot
c6298512e4 Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818540

Change-Id: If839b5722aa8a648e5b97d4c0ef7a111a0754631
2020-06-10 06:55:05 +00:00
Lorenzo Colitti
40e28391e5 [BOT.9] Add unit test for data warning in BpfCoordinator am: 1aa15dab62
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818918

Change-Id: Ia561692d2405b59d7518bcd4bc18b4a3e5ee1943
2020-06-10 06:54:56 +00:00
Lorenzo Colitti
d0ca099573 [BOT.4] Make BpfCoordinator to support data warning am: 11b88351c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818381

Change-Id: I945ba8844fa6f666772cd8a968ba06f00ea8e360
2020-06-10 06:54:53 +00:00
Hungming Chen
41c971a024 [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator am: 810a381cd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818380

Change-Id: Ibd36f70caf5980c575958f141116bda380fda04a
2020-06-10 06:54:50 +00:00
Hungming Chen
a2f02c617e [BOT.3] Add unit test for polling network stats in the coordinator am: 6442858f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818379

Change-Id: I9817b26a7e53dcc018fe52c632276bea2f523b68
2020-06-10 06:54:48 +00:00
Hungming Chen
81d15877d4 [BOT.2] Create a coordinator and stats provider to provide tether stats am: d50f53b58a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818539

Change-Id: Ic87b80f2856282e30fbba93a85cdfd3e8edb9fad
2020-06-10 06:54:39 +00:00
Hungming Chen
3b29ab8c1b [BOT.1] Add a class ForwardedStats in TetheringUtils am: 020cb554f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818818

Change-Id: I9ec4b9f4018c2c96c1e4ff3c0da9a7509c39ee44
2020-06-10 06:54:36 +00:00
TreeHugger Robot
ea022aada2 [automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 269c0886ed is in history

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

Change-Id: I9ce4aead2bd29bcc8226f498bcc0940d04c55319
2020-06-10 06:51:00 +00:00
Lorenzo Colitti
ee55230440 [automerger skipped] Merge "Use the latest stable netd AIDL interface in Tethering." into rvc-dev am: c76256c1ed am: 38fa7123d2 -s ours am: 0f28fa91bb -s ours
am skip reason: Change-Id I2d2cedf560319653f67f6b06f7abb0bf66eba91a with SHA-1 140042db6f is in history

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

Change-Id: I0524c3b513f1ba965ab299ad0bce28e9ca361070
2020-06-10 03:24:59 +00:00
Automerger Merge Worker
f6b2d0f3fb Merge "[automerger skipped] Merge "Use the latest stable netd AIDL interface in Tethering." into rvc-dev am: c76256c1ed am: 38fa7123d2 am: d75045b4d1 -s ours" into rvc-qpr-dev-plus-aosp 2020-06-10 03:24:42 +00:00
Lorenzo Colitti
5cb35e26e6 [automerger skipped] Merge "Use the latest stable netd AIDL interface in Tethering." into rvc-dev am: c76256c1ed am: 38fa7123d2 am: d75045b4d1 -s ours
am skip reason: Change-Id I2d2cedf560319653f67f6b06f7abb0bf66eba91a with SHA-1 140042db6f is in history

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

Change-Id: I3258f1c8b30b4d6daf5295e0086d779ac1ce9a32
2020-06-10 03:24:28 +00:00
Lorenzo Colitti
480ffd66f7 [automerger skipped] Merge "Use the latest stable netd AIDL interface in Tethering." into rvc-dev am: c76256c1ed -s ours am: feaff99264 -s ours am: f8c2ee6648 -s ours
am skip reason: Change-Id I2d2cedf560319653f67f6b06f7abb0bf66eba91a with SHA-1 140042db6f is in history

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

Change-Id: Ic762fc304f082aab862939042213647c6aad1b62
2020-06-10 03:24:20 +00:00
Lorenzo Colitti
0f28fa91bb [automerger skipped] Merge "Use the latest stable netd AIDL interface in Tethering." into rvc-dev am: c76256c1ed am: 38fa7123d2 -s ours
am skip reason: Change-Id I2d2cedf560319653f67f6b06f7abb0bf66eba91a with SHA-1 140042db6f is in history

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

Change-Id: I9b021bedebc62fccb5666e1aebf6e0c0d7d69c92
2020-06-10 03:18:40 +00:00
Lorenzo Colitti
f8c2ee6648 [automerger skipped] Merge "Use the latest stable netd AIDL interface in Tethering." into rvc-dev am: c76256c1ed -s ours am: feaff99264 -s ours
am skip reason: Change-Id I2d2cedf560319653f67f6b06f7abb0bf66eba91a with SHA-1 140042db6f is in history

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

Change-Id: Ice14a9bc82ea12f5721dfe0a68adf536094a2ec8
2020-06-10 03:18:24 +00:00
Treehugger Robot
7c538fa7ff [BOT.6] Make BpfCoordinator to support data limit
The BPF tethering coordinator listens to the forwarding rule
changes for updating data limit which is applied in the following
conditions.
- After adding the first rule on a given upstream, add data limit.
- After removing the last rule on a given upstream, clear data limit.
- The service applies a new data limit on current upstream.

The reason for relying on rule changes is because the Tethering and
IpServer objects have multi-internal state machines. It is hard to
synchronize all of their states.

Note that the data limit cleanup for stopping or switching upstream
relies on offload rules are all removed as well.

Bug: 150736748
Test: manual
Original-Change: https://android-review.googlesource.com/1302436
Merged-In: I829d36339973f9473fe6b616c48aa288f18d1c46
Change-Id: I829d36339973f9473fe6b616c48aa288f18d1c46
2020-06-10 03:14:34 +00:00
Lorenzo Colitti
1aa15dab62 [BOT.9] Add unit test for data warning in BpfCoordinator
Bug: 150736748
Test: atest BpfCoordinatorTest
Original-Change: https://android-review.googlesource.com/1311658
Merged-In: Ic1f37de75b064d7c8717e1b496e13174bb8693ec
Change-Id: Ic1f37de75b064d7c8717e1b496e13174bb8693ec
2020-06-10 03:13:49 +00:00
Lorenzo Colitti
11b88351c0 [BOT.4] Make BpfCoordinator to support data warning
Invoke the existing polling thread to update data alert statistics.
Once the data alert limit has reached, trigger the notification.

Bug: 150736748
Test: BpfCoordinatorTest
Original-Change: https://android-review.googlesource.com/1302435
Merged-In: Ibf25560ca2e9f003d8eba01361dc7d35ec1b1627
Change-Id: Ibf25560ca2e9f003d8eba01361dc7d35ec1b1627
2020-06-10 03:12:52 +00:00
Hungming Chen
810a381cd4 [BOT.5] Move class Ipv6ForwardingRule from IpServer to the coordinator
This is a preparation for moving adding/removing forwarding rules from
IpServer to BpfCoordinator.

Bug: 150736748
Test: atest IpServerTest
Original-Change: https://android-review.googlesource.com/1317234
Merged-In: I85316ef09ff3c9389ded11dcc384493d699da48e
Change-Id: I85316ef09ff3c9389ded11dcc384493d699da48e
2020-06-10 03:11:41 +00:00
Hungming Chen
6442858f9d [BOT.3] Add unit test for polling network stats in the coordinator
Verify that the coordinator could fetch tether stats from BPF maps and
report the network stats to the service.

Bug: 150736748
Test: atest BpfCoordinatorTest
Original-Change: https://android-review.googlesource.com/1305574
Merged-In: Ib1756159a2047c5db7d31359b0f288f840bd1bb1
Change-Id: Ib1756159a2047c5db7d31359b0f288f840bd1bb1
2020-06-10 03:10:48 +00:00
Hungming Chen
d50f53b58a [BOT.2] Create a coordinator and stats provider to provide tether stats
Make BPF tethering offload coordinator, BpfCoordinator,
registers a network stats provider, BpfTetherStatsProvider, and
provide the tethering stats from the BPF map.

Bug: 150736748
Test: new test BpfCoordinatorTest

Original-Change: https://android-review.googlesource.com/1256189
Merged-In: I22e71f87b67668f7e733e4f215d93bf5b2c9380d
Change-Id: I22e71f87b67668f7e733e4f215d93bf5b2c9380d
2020-06-10 03:10:13 +00:00
Lorenzo Colitti
38fa7123d2 Merge "Use the latest stable netd AIDL interface in Tethering." into rvc-dev am: c76256c1ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11807347

Change-Id: Ifd88be2016a986ac473ec963e032bda0128261e7
2020-06-10 03:09:52 +00:00
Hungming Chen
020cb554f5 [BOT.1] Add a class ForwardedStats in TetheringUtils
Used to record offload transmitted/received forwarded bytes/packets.

Bug: 150736748
Test: new test BpfTetheringCoordinatorTest
Original-Change: https://android-review.googlesource.com/1306257
Merged-In: Ie8725f95c3ddd5fb3811d479de32d2c1f7dcb493
Change-Id: Ie8725f95c3ddd5fb3811d479de32d2c1f7dcb493
2020-06-10 03:09:36 +00:00
Lorenzo Colitti
feaff99264 [automerger skipped] Merge "Use the latest stable netd AIDL interface in Tethering." into rvc-dev am: c76256c1ed -s ours
am skip reason: Change-Id I2d2cedf560319653f67f6b06f7abb0bf66eba91a with SHA-1 140042db6f is in history

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

Change-Id: Icf3b30f389b53a9aff94bdb89e36862ea6960a8d
2020-06-10 03:09:27 +00:00
Treehugger Robot
99a9f03255 Merge "Address comment from aosp/1232197" am: 7e6ff1bde1 am: a87d030207 am: 5a18fd3d2c am: 30543064b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318288

Change-Id: Ida4e4b34b59d501e906b4c86dec9e2a8d494639c
2020-06-09 18:22:34 +00:00
Treehugger Robot
30543064b5 Merge "Address comment from aosp/1232197" am: 7e6ff1bde1 am: a87d030207 am: 5a18fd3d2c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318288

Change-Id: Ieca8e912713aa966422f49530dfe7bbde4e480ff
2020-06-09 18:11:11 +00:00
Treehugger Robot
5a18fd3d2c Merge "Address comment from aosp/1232197" am: 7e6ff1bde1 am: a87d030207
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318288

Change-Id: Iabdcc3b95239019a625e9823f70c30a9bded706a
2020-06-09 17:59:03 +00:00
Treehugger Robot
7e6ff1bde1 Merge "Address comment from aosp/1232197" 2020-06-09 17:19:33 +00:00
Lorenzo Colitti
601971d2d2 Use the latest stable netd AIDL interface in Tethering.
This is required to use the new BPF tethering APIs that set data
usage limits.

AOSP and master are already using -unstable instead of -V3.
In order not to change master, the Merged-In tag is set to the CL
that switched AOSP (and master) to -unstable.

Test: m
Bug: 150736748
Merged-In: I2d2cedf560319653f67f6b06f7abb0bf66eba91a
Change-Id: Idba29b0fe428ac6552a025dcbe15729739088e9e
2020-06-10 01:07:29 +09:00
Treehugger Robot
6384a7e2c2 Merge "[BOT.6] Make BpfCoordinator to support data limit" am: 73dd6f71f8 am: 3e58ec268b am: fe3f85ba3d am: b3debb2fd2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302436

Change-Id: I65f8667c11d8a97cdf8146b2092b7d9be20ddc19
2020-06-09 13:55:56 +00:00
Treehugger Robot
b3debb2fd2 Merge "[BOT.6] Make BpfCoordinator to support data limit" am: 73dd6f71f8 am: 3e58ec268b am: fe3f85ba3d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302436

Change-Id: Ia746504d8299635b5418af4ecad21a49e844b7a2
2020-06-09 13:42:24 +00:00
Treehugger Robot
fe3f85ba3d Merge "[BOT.6] Make BpfCoordinator to support data limit" am: 73dd6f71f8 am: 3e58ec268b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302436

Change-Id: Icf64d856318173ad599a4f48295c9bdf591967f1
2020-06-09 13:28:38 +00:00
Treehugger Robot
73dd6f71f8 Merge "[BOT.6] Make BpfCoordinator to support data limit" 2020-06-09 12:58:20 +00:00
Mark Chien
f42bfa272e Merge "Move TetheringTests to presubmit" am: 597265fa13 am: 6b63e8da67 am: 43e70468ce am: afa80c5df1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318279

Change-Id: Ie1b54b00ad2e5028e69c4f902753a05237cdca6c
2020-06-09 09:49:49 +00:00
Mark Chien
afa80c5df1 Merge "Move TetheringTests to presubmit" am: 597265fa13 am: 6b63e8da67 am: 43e70468ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318279

Change-Id: Icbeb8e94e0ca4b1cba9c9d373f48209a3ee71a87
2020-06-09 09:38:39 +00:00