Commit Graph

1458 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
aca14f6f73 Merge "Make tether settings intent explicit" am: 51241a168c am: 913cd757d5 am: 98a32f115d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318286

Change-Id: I6f93524a724167fd48edab49af027732eee13d74
2020-06-08 16:36:40 +00:00
Xin Li
14beee853a [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: d7785982ac -s ours am: 8028fe1945 -s ours am: 669666f430 -s ours
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 22238ed86f is in history

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

Change-Id: Ie30658c18424bb30696876b4b4a103fe1c645ab7
2020-06-08 16:29:22 +00:00
Paul Hu
98a32f115d Merge "Make tether settings intent explicit" am: 51241a168c am: 913cd757d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318286

Change-Id: I7eafc623fcd88b9544756295d84c936c2ab2507a
2020-06-08 16:20:55 +00:00
Xin Li
669666f430 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: d7785982ac -s ours am: 8028fe1945 -s ours
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 22238ed86f is in history

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

Change-Id: I3811100a743b62c5a5e9f661647793b719824679
2020-06-08 16:08:03 +00:00
Paul Hu
51241a168c Merge "Make tether settings intent explicit" 2020-06-08 10:31:21 +00:00
Hungming Chen
b1406cf0d6 [BOT.9] Add unit test for data warning in BpfCoordinator
Bug: 150736748
Test: atest BpfCoordinatorTest
Change-Id: Ic1f37de75b064d7c8717e1b496e13174bb8693ec
2020-06-08 17:31:51 +08:00
Hungming Chen
c42a0ffc0d [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
Change-Id: Ibf25560ca2e9f003d8eba01361dc7d35ec1b1627
2020-06-08 17:31:34 +08:00
paulhu
3fe5434d19 Make tether settings intent explicit
Currently tethering notification is sending a pending intent for
redirecting user to tether settings page. However, this intent
is implicit that only create with
Settings.ACTION_TETHER_SETTINGS. For security reasons, this
intetnt should specify an explicit component to be delivered to.
Thus, specify the settings package name to this intent.

Test: atest TetheringTests
Bug: 156353008
Change-Id: I49187aee8a004caa890e2a73c0a28d280215c7d4
2020-06-08 06:04:19 +00:00
Xin Li
d56d89c8a6 Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: I5e28537689d1a53e99f91eafd494eb3a0c890f46
Change-Id: I436ef37a509cbe56d02c6d8d3a38c776f4b4883f
2020-06-03 10:45:02 -07:00
Maciej Żenczykowski
076222e52c [automerger skipped] Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." am: cfacebd651 am: 22238ed86f -s ours am: 9ceac21066 -s ours
am skip reason: Change-Id I76a75a16fa27b47d78816b2f9379ef4bb68beb00 with SHA-1 b5898ad53a is in history

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

Change-Id: I71201909585461cff1cfaa0ab0dc5e174b2230c8
2020-06-03 06:00:28 +00:00
Maciej Żenczykowski
9ceac21066 [automerger skipped] Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." am: cfacebd651 am: 22238ed86f -s ours
am skip reason: Change-Id I76a75a16fa27b47d78816b2f9379ef4bb68beb00 with SHA-1 b5898ad53a is in history

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

Change-Id: Ieb50a0aa01cf69e0d393d901e040ff0cd6ca4bbd
2020-06-03 05:48:31 +00:00
Maciej Żenczykowski
22238ed86f Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." am: cfacebd651
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322377

Change-Id: I5e28537689d1a53e99f91eafd494eb3a0c890f46
2020-06-03 05:32:55 +00:00