TreeHugger Robot
3425b6bf39
[automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838 am: 744e7cd238 -s ours
...
am skip reason: Change-Id Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb with SHA-1 519f1201ca is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11892958
Change-Id: Ie48eb87f40d373fd51ee8512dee2ffddb1959cf2
2020-06-18 14:54:39 +00:00
Nucca Chen
63df5ec43a
[automerger skipped] [BOT.8] Dump BPF offload information in dumpsys am: a340f25d3e am: 9d19ebf408 -s ours
...
am skip reason: Change-Id I95ea3050d92f3ba8136a63cd399d3450d183c8dc with SHA-1 a340f25d3e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882881
Change-Id: I72800eaaf3c7c433ae0c2a023ac9f8196f21f863
2020-06-18 14:54:36 +00:00
Nucca Chen
bc63b4f34d
[automerger skipped] [BOT.10] Add unit test for data limit and rule change in BpfCoordinator am: 2fbc671d4a am: f7257aaec8 -s ours
...
am skip reason: Change-Id I5a98c4cd74e2de6005ee05defa761f6af3fd4e75 with SHA-1 2fbc671d4a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882403
Change-Id: I229d051c0534f09a5ff7dc16da1eaf91850b992c
2020-06-18 14:54:33 +00:00
TreeHugger Robot
744e7cd238
Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11892958
Change-Id: I25556f14d4f249e9360cc42ac6fac22df76e91fc
2020-06-18 14:50:18 +00:00
Nucca Chen
9d19ebf408
[BOT.8] Dump BPF offload information in dumpsys am: a340f25d3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882881
Change-Id: I01c07889d61ce9ef6280e2b1134887e26505ba6d
2020-06-18 14:50:15 +00:00
Nucca Chen
f7257aaec8
[BOT.10] Add unit test for data limit and rule change in BpfCoordinator am: 2fbc671d4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882403
Change-Id: I92fbb8eab84fa09e632f329e752ae06808eda951
2020-06-18 14:50:13 +00:00
Mark Chien
c50a851e80
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 0382ca9dc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350
Change-Id: I637cbe7ca147eec10a901d74aaebfab36ebf8950
2020-06-18 14:34:18 +00:00
Mark Chien
b073d590ac
Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: 7b5f30d3a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076
Change-Id: Ie7bab041938f1e7c25b010ae565791d4c51bd019
2020-06-18 14:32:01 +00:00
Mark Chien
0382ca9dc1
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350
Change-Id: I06154325294f31d3f742d38e8f5eea1ff2190a88
2020-06-18 14:28:08 +00:00
Mark Chien
7b5f30d3a4
Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076
Change-Id: Ida5076888f61e8e472e853ce1ee58f8106dacbb2
2020-06-18 14:25:17 +00:00
Lorenzo Colitti
b2c6c0f0a8
Merge "Move DnsPacket to libs net" into rvc-dev am: 52032fa586 am: b957bd7af2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407
Change-Id: I130496147364f798817d7d12e814749e86f0ab0c
2020-06-18 10:47:59 +00:00
Lorenzo Colitti
b957bd7af2
Merge "Move DnsPacket to libs net" into rvc-dev am: 52032fa586
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407
Change-Id: Ia19cb44ad56e4358c63564261d481459d1386542
2020-06-18 10:34:11 +00:00
Lorenzo Colitti
52032fa586
Merge "Move DnsPacket to libs net" into rvc-dev
2020-06-18 10:14:47 +00:00
Luke Huang
8dd7e0a936
Move DnsPacket to libs net
...
This class might be used by some mainline modules.
Bug: 151052811
Test: atest DnsPacketTest
Test: atest DnsResolverTest
Change-Id: I8841d91456952ded5efbf8ea221289aecc7746ad
2020-06-18 16:17:04 +08:00
Treehugger Robot
d1168d23f2
Merge "Add owneship of tethering module" am: 51a573cd07 am: ee9b027fce am: 2fd07fd83c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340034
Change-Id: I45acc68c3fdcc520675208eedb6053409062c235
2020-06-18 06:53:23 +00:00
Treehugger Robot
2fd07fd83c
Merge "Add owneship of tethering module" am: 51a573cd07 am: ee9b027fce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340034
Change-Id: Ic2f337be5cf8ed7f89fb88a2395df902cbdac441
2020-06-18 06:45:55 +00:00
Treehugger Robot
51a573cd07
Merge "Add owneship of tethering module"
2020-06-18 06:14:44 +00:00
TreeHugger Robot
b0edbf618a
[automerger skipped] Merge "[BOT.13] Make offload coordinator poll interval configurable" into rvc-dev am: 6fddfb71e4 -s ours am: 69fd06b743 -s ours
...
am skip reason: Change-Id I7f8dde3b57ee14eb33edbe2fd383df33cccc231c with SHA-1 bfdcfe4ecd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882405
Change-Id: I43684cb98e71f94e9d888e9db738a6d2fc31ac92
2020-06-18 05:38:05 +00:00
TreeHugger Robot
69fd06b743
[automerger skipped] Merge "[BOT.13] Make offload coordinator poll interval configurable" into rvc-dev am: 6fddfb71e4 -s ours
...
am skip reason: Change-Id I7f8dde3b57ee14eb33edbe2fd383df33cccc231c with SHA-1 bfdcfe4ecd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882405
Change-Id: I7237ba347d78f60094707d1b935c8f457c15e8d1
2020-06-18 05:30:24 +00:00
TreeHugger Robot
6fa30d544e
[automerger skipped] Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" into rvc-dev am: 3358560be8 -s ours am: 3bf5ab8826 -s ours
...
am skip reason: Change-Id Iedb936b7592b6be773d1b84a2498bfc5a440a198 with SHA-1 8b3af8d775 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11883504
Change-Id: I9117014c6110af3765110b17a47091d65d686bc4
2020-06-18 05:24:12 +00:00
TreeHugger Robot
4645e947de
[automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838 -s ours am: 6f726b9893 -s ours
...
am skip reason: Change-Id Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb with SHA-1 519f1201ca is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11892958
Change-Id: Iea49e0abbb475f7a57c499479c42fec1730a04c6
2020-06-18 05:23:42 +00:00
TreeHugger Robot
3bf5ab8826
[automerger skipped] Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" into rvc-dev am: 3358560be8 -s ours
...
am skip reason: Change-Id Iedb936b7592b6be773d1b84a2498bfc5a440a198 with SHA-1 8b3af8d775 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11883504
Change-Id: I79ca8d7c5679f170b251d4f376bc9908b002ca9c
2020-06-18 05:23:02 +00:00
TreeHugger Robot
6f726b9893
[automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838 -s ours
...
am skip reason: Change-Id Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb with SHA-1 519f1201ca is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11892958
Change-Id: Ia8d500395dfd5fefac69025452bae071182e27e3
2020-06-18 05:17:47 +00:00
markchien
c907a99efd
Add owneship of tethering module
...
Bug: 158961959
Test: build/make/tools/checkowners.py packages/NetworkStack/OWNERS
Test: ./build/make/tools/checkowners.py \
frameworks/base/packages/Tethering/OWNERS
Change-Id: I13b291e5db6a8a8c9f2bfa477acabaea250aa48c
2020-06-18 11:34:29 +08:00
Nucca Chen
1c0d8487b4
[BOT.13] Make offload coordinator poll interval configurable
...
Bug: 150736748
Test: BpfCoordinatorTest
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315576
Merged-In: I7f8dde3b57ee14eb33edbe2fd383df33cccc231c
Change-Id: I70a6e5c8e765daf40cb738feb7fd70cf3c8f052d
(cherry picked from commit bb61893406 )
2020-06-17 07:45:57 +00:00
Nucca Chen
0a0d4e156d
[BOT.12] Add unit test for disabling BpfCoordinator by config
...
Bug: 150736748
Test: BpfCoordinatorTest
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313802
Merged-In: Iedb936b7592b6be773d1b84a2498bfc5a440a198
Change-Id: I298ae39a1fa61b2cf97752aa908aa2d7d0f9783d
(cherry picked from commit 3aba923ce2 )
2020-06-17 07:43:41 +00:00
Nucca Chen
d105961e58
[BOT.11] BpfCoordinator could be disabled by device config
...
Bug: 150736748
Test: BpfCoordinatorTest
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955
Merged-In: Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb
Change-Id: I48a8de478c9200b8c9f88e785340fc7973e4a13f
(cherry picked from commit fe737bc2b2 )
2020-06-17 07:40:40 +00:00
Nucca Chen
a340f25d3e
[BOT.8] Dump BPF offload information in dumpsys
...
$ adb shell dumpsys tethering
BPF offload:
Polling started
Stats provider registered
Upstream quota: {rmnet_data2=9223372036854775807}
Forwarding stats:
12(rmnet_data2) - ForwardedStats(rxb: 1065, rxp: 5, txb: 0, txp: 0)
Forwarding rules:
[wlan1]: iif(iface) oif(iface) v6addr srcmac dstmac
12(rmnet_data2) 31(wlan1) /2401:e180:8831:77ae:a900:a03b:41fb..
Bug: 150736748
Test: Enable tethering on mobile data and check dumpsys tethering
Original-Change: https://android-review.googlesource.com/1302438
Merged-In: I95ea3050d92f3ba8136a63cd399d3450d183c8dc
Change-Id: I95ea3050d92f3ba8136a63cd399d3450d183c8dc
2020-06-17 07:29:10 +00:00
Nucca Chen
ce40743de1
Merge "[BOT.13] Make offload coordinator poll interval configurable" am: 8b7c9a2f87 am: 558d3e3ad2 am: c2be69eff8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315576
Change-Id: I5aaa87abc25326d64ef5209c46681b25fc724830
2020-06-17 06:39:30 +00:00
Nucca Chen
0bfb34ebf0
Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" am: 6241525504 am: d36e818816 am: 4a87f05849
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313802
Change-Id: Ied3180b01baea66971a5e739c43a4e813f2fd956
2020-06-17 06:38:56 +00:00
Nucca Chen
2ccef37a68
Merge "[BOT.11] BpfCoordinator could be disabled by device config" am: e8c985be78 am: 36e37ff125 am: d7f13cb23b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955
Change-Id: Ia741c126d73ec9a2dd4cbe77012c727be3c037d7
2020-06-17 06:38:41 +00:00
Nucca Chen
7f90b4033b
Merge "[BOT.8] Dump BPF offload information in dumpsys" am: e765ab3d36 am: 52d3db170e am: be3598c113
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302438
Change-Id: I49d9d3fcf481993466e49dc4a7fc9b4590cc2f02
2020-06-17 06:38:22 +00:00
Nucca Chen
5b878baac3
Merge "[BOT.10] Add unit test for data limit and rule change in BpfCoordinator" am: 8392e11329 am: 0d295a8642 am: b079e02a39
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311659
Change-Id: I4605077e115f200f1808403307131ff8c2a82d01
2020-06-17 06:37:57 +00:00
Mark Chien
bccb89a187
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 7e501e2967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350
Change-Id: Ie42e9d3f4310bc8e42eafda1e420bcdc3d8557f5
2020-06-17 06:37:33 +00:00
Nucca Chen
2fbc671d4a
[BOT.10] Add unit test for data limit and rule change in BpfCoordinator
...
The applying data limit is based on the forwarding rule changes.
Add the tests for verifying their interactions with netd.
Bug: 150736748
Test: BpfCoordinatorTest
Original-Change: https://android-review.googlesource.com/1311659
Merged-In: I5a98c4cd74e2de6005ee05defa761f6af3fd4e75
Change-Id: I5a98c4cd74e2de6005ee05defa761f6af3fd4e75
2020-06-17 06:35:43 +00:00
Nucca Chen
c2be69eff8
Merge "[BOT.13] Make offload coordinator poll interval configurable" am: 8b7c9a2f87 am: 558d3e3ad2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315576
Change-Id: Ia1befc327f71df979bd60cb4fcb96a0ed69afbef
2020-06-17 06:33:42 +00:00
Nucca Chen
4a87f05849
Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" am: 6241525504 am: d36e818816
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313802
Change-Id: Ica3e4752091c3460296f7d06ccb1e0827aec29f6
2020-06-17 06:33:31 +00:00
Nucca Chen
d7f13cb23b
Merge "[BOT.11] BpfCoordinator could be disabled by device config" am: e8c985be78 am: 36e37ff125
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955
Change-Id: If0f1df54216517aff5af0ce4ae120b25d7fdbaf6
2020-06-17 06:32:52 +00:00
Nucca Chen
be3598c113
Merge "[BOT.8] Dump BPF offload information in dumpsys" am: e765ab3d36 am: 52d3db170e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302438
Change-Id: Ifd56fe444a7610736eb9f915f8df70f73eec8c02
2020-06-17 06:32:35 +00:00
Nucca Chen
b079e02a39
Merge "[BOT.10] Add unit test for data limit and rule change in BpfCoordinator" am: 8392e11329 am: 0d295a8642
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311659
Change-Id: I9e6a6c89a080d7b168d31f390cc6241c252e7341
2020-06-17 06:31:45 +00:00
Mark Chien
7e501e2967
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350
Change-Id: Ibfea2e6f2564942eca60c84a5df5583acc1b9e8b
2020-06-17 06:24:22 +00:00
Mark Chien
404c3adad7
Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev
2020-06-17 06:07:52 +00:00
Mark Chien
cd1d6ff1ff
Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: edd4b50f58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076
Change-Id: I2b5b8b9054561a8e9a288cb15465ede56e4a9754
2020-06-17 02:58:21 +00:00
Mark Chien
edd4b50f58
Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076
Change-Id: I1d9075a7c112dd1345d6a8dacf343886dc1b286b
2020-06-17 02:47:31 +00:00
markchien
017bfba0d8
Protect invalid entitlement app configuration
...
There is a protection in Settings that Settings would gray out if
tethering requires entitlement check but the entitlement app is
invalid. Tethering resource is moved from framework to tethering
module, so Settings can not fetch entitlement app name anymore.
In this change, tethering module would check whether entitltement app
package name is exsited if entitlement check is needed. Tethering would
be not supported (Settings tethering option would be hidded) if
entitlement app is not installed.
After moving the protection into tethering module,
TetherUtil#isProvisioningNeeded is no longer needed. Because The
only use case is Settings wants to gray out tethering setting
when entitltement check is needed but entitlement app is invalid.
Bug: 146918263
Test: atest TetheringCoverageTests
Change-Id: I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6
2020-06-16 19:06:34 +08:00
Hungming Chen
bfdcfe4ecd
[BOT.13] Make offload coordinator poll interval configurable
...
Bug: 150736748
Test: BpfCoordinatorTest
Change-Id: I7f8dde3b57ee14eb33edbe2fd383df33cccc231c
2020-06-16 18:01:24 +08:00
Hungming Chen
8b3af8d775
[BOT.12] Add unit test for disabling BpfCoordinator by config
...
Bug: 150736748
Test: BpfCoordinatorTest
Change-Id: Iedb936b7592b6be773d1b84a2498bfc5a440a198
2020-06-16 18:01:17 +08:00
Mark Chien
c55e229dcb
Revert "Revert "Pass entitlement configuration to Settings for entitlement check""
...
Add commit message here for reference:
Tethering resource configuration is move from framework to tethering
module. The resource would not be accessible from outside of tethering
module.
List the replacements of framework resources usage and intent extra:
1. R.string.config_mobile_hotspot_provision_response
--> android.net.extra.TETHER_PROVISIONING_RESPONSE.
2. R.string.config_mobile_hotspot_provision_app_no_ui
--> android.net.extra.TETHER_UI_PROVISIONING_APP_NAME
3. R.array.config_mobile_hotspot_provision_app
--> android.net.extra.TETHER_SILENT_PROVISIONING_ACTION
Besides, the current active subId would put in
android.net.extra.TETHER_SUBID
Note: They are not APIs because of API freeze. Now both tethering module
and Settings define these strings independently.
Bug: 146918263
Test: atest TetherServiceTest
atest TetherProvisioningActivityTest
This reverts commit 9988903174 .
Reason for revert: Resume the CL and put this CL with settings part in the same topic to avoid break.
Change-Id: I114b4c258743661df51e5a969e150047a292e035
2020-06-15 16:38:53 +00:00
Hungming Chen
519f1201ca
[BOT.11] BpfCoordinator could be disabled by device config
...
Bug: 150736748
Test: BpfCoordinatorTest
Change-Id: Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb
2020-06-15 21:16:26 +08:00
Hungming Chen
e571cfd53f
[BOT.8] Dump BPF offload information in dumpsys
...
$ adb shell dumpsys tethering
BPF offload:
Polling started
Stats provider registered
Upstream quota: {rmnet_data2=9223372036854775807}
Forwarding stats:
12(rmnet_data2) - ForwardedStats(rxb: 1065, rxp: 5, txb: 0, txp: 0)
Forwarding rules:
[wlan1]: iif(iface) oif(iface) v6addr srcmac dstmac
12(rmnet_data2) 31(wlan1) /2401:e180:8831:77ae:a900:a03b:41fb..
Bug: 150736748
Test: Enable tethering on mobile data and check dumpsys tethering
Change-Id: I95ea3050d92f3ba8136a63cd399d3450d183c8dc
2020-06-15 21:14:28 +08:00