TreeHugger Robot
536316aafc
[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: a046f97ad2 -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: I6650adc731de0049151e5a872d946ccf0c6a3a32
2020-06-10 07:31:31 +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
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
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
db612138a5
[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: ee55230440 -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: Ia0ca36595f0f0b70d6c1d89076fd1691649f8e7e
2020-06-10 03:44:46 +00:00
Automerger Merge Worker
faf979e679
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 am: f6b2d0f3fb -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: I8181f9a0150e4e330729c9daac4ca2271b2341ae
2020-06-10 03:44:18 +00:00
Automerger Merge Worker
ffaa9d56b9
Merge "[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" into rvc-qpr-dev-plus-aosp am: 8c0cf97be3 -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: Ic6b062b801055f67b0494655780c4d5076ff0cfc
2020-06-10 03:43:38 +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
734076036d
Merge "Address comment from aosp/1232197" am: 7e6ff1bde1 am: a87d030207 am: 5a18fd3d2c am: 30543064b5 am: 99a9f03255
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318288
Change-Id: Ib1c65c3f9880792b49813bb6871f0eb8f0dcb880
2020-06-09 18:28:16 +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
23d3edbde9
Merge "[BOT.6] Make BpfCoordinator to support data limit" am: 73dd6f71f8 am: 3e58ec268b am: fe3f85ba3d am: b3debb2fd2 am: 6384a7e2c2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302436
Change-Id: I67c81b00045b747e2b976e4d1017d88c7bb2d024
2020-06-09 14:09:14 +00: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
83e2c271f8
Merge "Move TetheringTests to presubmit" am: 597265fa13 am: 6b63e8da67 am: 43e70468ce am: afa80c5df1 am: f42bfa272e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318279
Change-Id: I1d8b2b50db95291d2058430057534d69f2fb0149
2020-06-09 10:07:19 +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
Hungming Chen
269c0886ed
[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
Change-Id: I829d36339973f9473fe6b616c48aa288f18d1c46
2020-06-09 17:33:03 +08:00
Mark Chien
43e70468ce
Merge "Move TetheringTests to presubmit" am: 597265fa13 am: 6b63e8da67
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318279
Change-Id: I6cbfa15e623daef9dc70e764a4f701689209f1b2
2020-06-09 09:24:40 +00:00
Mark Chien
597265fa13
Merge "Move TetheringTests to presubmit"
2020-06-09 08:48:13 +00:00
Lorenzo Colitti
5229ce83c1
Merge "[BOT.9] Add unit test for data warning in BpfCoordinator" am: fd349683c9 am: dd9f16708c am: 6ae789f577 am: 03bfac4fba am: d0ce22518f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311658
Change-Id: If111f79a8e218518b8d6a389c723141168371d29
2020-06-09 03:15:15 +00:00
Automerger Merge Worker
6cb4fb6f50
Merge "Merge "[BOT.4] Make BpfCoordinator to support data warning" am: cdf210fd71 am: 74b81e046c am: 4ac4347e8b" into rvc-d1-dev-plus-aosp am: 8b2df8df35 am: dfee3092f5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302435
Change-Id: I312f88e60e9c85e1f3b48e6c251dc0bd38fbb2d5
2020-06-09 03:14:54 +00:00
Lorenzo Colitti
d0ce22518f
Merge "[BOT.9] Add unit test for data warning in BpfCoordinator" am: fd349683c9 am: dd9f16708c am: 6ae789f577 am: 03bfac4fba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311658
Change-Id: Ifeb111f2b15cdfe2f7db70615f81f6d22bd6e326
2020-06-09 03:07:54 +00:00
Lorenzo Colitti
03bfac4fba
Merge "[BOT.9] Add unit test for data warning in BpfCoordinator" am: fd349683c9 am: dd9f16708c am: 6ae789f577
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311658
Change-Id: I0ecf145dc8e0a87f014d6aad201cd50b6c7136bc
2020-06-09 03:02:37 +00:00
Automerger Merge Worker
dfee3092f5
Merge "Merge "[BOT.4] Make BpfCoordinator to support data warning" am: cdf210fd71 am: 74b81e046c am: 4ac4347e8b" into rvc-d1-dev-plus-aosp am: 8b2df8df35
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302435
Change-Id: If732bcf0706801b4823c6f77231c832cbdbcc242
2020-06-09 02:59:27 +00:00
Lorenzo Colitti
6ae789f577
Merge "[BOT.9] Add unit test for data warning in BpfCoordinator" am: fd349683c9 am: dd9f16708c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311658
Change-Id: I5db2504e87edf3389dced385191cc250b88e2da0
2020-06-09 02:55:52 +00:00
Lorenzo Colitti
105b28d523
Merge "[BOT.4] Make BpfCoordinator to support data warning" am: cdf210fd71 am: 74b81e046c am: 4ac4347e8b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302435
Change-Id: Ib23a75528a26cc48413c38c1e1aaf668eb0e8589
2020-06-09 02:55:46 +00:00
Lorenzo Colitti
4ac4347e8b
Merge "[BOT.4] Make BpfCoordinator to support data warning" am: cdf210fd71 am: 74b81e046c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302435
Change-Id: I686b01c362ed61d7333279f4c951039afa9a2fbd
2020-06-09 02:55:01 +00:00
Lorenzo Colitti
fd349683c9
Merge "[BOT.9] Add unit test for data warning in BpfCoordinator"
2020-06-09 02:22:59 +00:00
Lorenzo Colitti
cdf210fd71
Merge "[BOT.4] Make BpfCoordinator to support data warning"
2020-06-09 02:22:43 +00:00
Paul Hu
dfec1d719f
Merge "Make tether settings intent explicit" am: 51241a168c am: 913cd757d5 am: 98a32f115d am: aca14f6f73 am: 0b985506fa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318286
Change-Id: I289182fb29004e4364b1b01316b5abd0cd426b10
2020-06-08 17:39:28 +00:00