Commit Graph

2510 Commits

Author SHA1 Message Date
Lorenzo Colitti
06e8fb1d0e Merge "Move DnsPacket to libs net" into rvc-dev am: 52032fa586 am: b957bd7af2 am: b2c6c0f0a8 am: 7295cb165c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: Ida1e72cf4d56b175ba2121fd8ed06b3701aad770
2020-06-18 11:23:50 +00:00
Lorenzo Colitti
7295cb165c Merge "Move DnsPacket to libs net" into rvc-dev am: 52032fa586 am: b957bd7af2 am: b2c6c0f0a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: I15e4f426e47cdc77a1cdccb1501f7e649c9a6bbf
2020-06-18 11:04:23 +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
506381245b Merge "Add owneship of tethering module" am: 51a573cd07 am: ee9b027fce am: 2fd07fd83c am: d1168d23f2 am: daef140cf2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340034

Change-Id: I773f0fe638f1bc62930085c333b48af9ce68b7f9
2020-06-18 07:17:04 +00:00
Treehugger Robot
daef140cf2 Merge "Add owneship of tethering module" am: 51a573cd07 am: ee9b027fce am: 2fd07fd83c am: d1168d23f2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340034

Change-Id: Iab27a96c29060c7288f21345bf82d28a8b9bcdbf
2020-06-18 07:04:10 +00: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
3417b97860 [automerger skipped] Merge "[BOT.13] Make offload coordinator poll interval configurable" into rvc-dev am: 6fddfb71e4 -s ours am: 69fd06b743 -s ours am: b0edbf618a -s ours am: 13ccd1ccbc -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: I4511fc544cb4700ce468c1348936483c145f03ca
2020-06-18 06:08:55 +00:00
TreeHugger Robot
13ccd1ccbc [automerger skipped] Merge "[BOT.13] Make offload coordinator poll interval configurable" into rvc-dev am: 6fddfb71e4 -s ours am: 69fd06b743 -s ours am: b0edbf618a -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: Ie1f4935534da17e2cd618bc6d44feeb785986a5a
2020-06-18 05:55:01 +00:00
TreeHugger Robot
6b288175cf [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: 6fa30d544e -s ours am: 95a99666bb -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: If2b6290c608fad6014d729721667307c9df1fffa
2020-06-18 05:45:56 +00:00
TreeHugger Robot
24e54b79c0 [automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838 -s ours am: 6f726b9893 -s ours am: 4645e947de -s ours am: cbb16ea5cb -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: Id5a65b4b1ba7db966d02b8c65fba978508d3d51e
2020-06-18 05:45:37 +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
95a99666bb [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: 6fa30d544e -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: Ie953624635fef48948a1e4d811df7c4de13e02eb
2020-06-18 05:30:51 +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
cbb16ea5cb [automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838 -s ours am: 6f726b9893 -s ours am: 4645e947de -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: I3e5b309863aeca7c423bb3cf31fc283e27e87c12
2020-06-18 05:30:18 +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
bb61893406 Merge "[BOT.13] Make offload coordinator poll interval configurable" am: 8b7c9a2f87 am: 558d3e3ad2 am: c2be69eff8 am: ce40743de1 am: 9f6da6a9e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315576

Change-Id: I70a6e5c8e765daf40cb738feb7fd70cf3c8f052d
2020-06-17 07:04:26 +00:00
Nucca Chen
3aba923ce2 Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" am: 6241525504 am: d36e818816 am: 4a87f05849 am: 0bfb34ebf0 am: d0e50377a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313802

Change-Id: I298ae39a1fa61b2cf97752aa908aa2d7d0f9783d
2020-06-17 07:03:57 +00:00
Nucca Chen
fe737bc2b2 Merge "[BOT.11] BpfCoordinator could be disabled by device config" am: e8c985be78 am: 36e37ff125 am: d7f13cb23b am: 2ccef37a68 am: e6f8681f33
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955

Change-Id: I48a8de478c9200b8c9f88e785340fc7973e4a13f
2020-06-17 07:03:39 +00:00
Nucca Chen
cb183c30cf Merge "[BOT.8] Dump BPF offload information in dumpsys" am: e765ab3d36 am: 52d3db170e am: be3598c113 am: 7f90b4033b am: 4dab032009
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302438

Change-Id: Id4f11bacd0e3fd3c1b9426465e38d1f01fb4ecd6
2020-06-17 07:03:18 +00:00
Nucca Chen
3af4ef9ce5 Merge "[BOT.10] Add unit test for data limit and rule change in BpfCoordinator" am: 8392e11329 am: 0d295a8642 am: b079e02a39 am: 5b878baac3 am: e424cd0a18
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311659

Change-Id: I9e5ca6c6d61e35f0b65add90b19d59c05a77bf0f
2020-06-17 07:02:46 +00:00
Mark Chien
37867cc26b Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 7e501e2967 am: bccb89a187 am: 36a6c56989
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350

Change-Id: Ic89fe046e75a76aebf05e47c8754010f52a45536
2020-06-17 07:02:13 +00:00
Nucca Chen
9f6da6a9e7 Merge "[BOT.13] Make offload coordinator poll interval configurable" am: 8b7c9a2f87 am: 558d3e3ad2 am: c2be69eff8 am: ce40743de1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315576

Change-Id: Ie6b97c55cd7d638ce9ed1c0d22edf07df60b47aa
2020-06-17 06:50:54 +00:00
Nucca Chen
d0e50377a4 Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" am: 6241525504 am: d36e818816 am: 4a87f05849 am: 0bfb34ebf0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313802

Change-Id: I996d1752c63c79d772427a309a86eceae38b112c
2020-06-17 06:50:44 +00:00
Nucca Chen
e6f8681f33 Merge "[BOT.11] BpfCoordinator could be disabled by device config" am: e8c985be78 am: 36e37ff125 am: d7f13cb23b am: 2ccef37a68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313955

Change-Id: I3843d263700b65380e0d539a10b1e648415f8cf5
2020-06-17 06:50:27 +00:00
Nucca Chen
4dab032009 Merge "[BOT.8] Dump BPF offload information in dumpsys" am: e765ab3d36 am: 52d3db170e am: be3598c113 am: 7f90b4033b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302438

Change-Id: I2d4e850c395e1a3826e33e6c33ef73331e53fefd
2020-06-17 06:50:11 +00:00
Nucca Chen
e424cd0a18 Merge "[BOT.10] Add unit test for data limit and rule change in BpfCoordinator" am: 8392e11329 am: 0d295a8642 am: b079e02a39 am: 5b878baac3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311659

Change-Id: I16cba2d4b326767a7295667d601183cd47833018
2020-06-17 06:49:41 +00:00
Mark Chien
36a6c56989 Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 7e501e2967 am: bccb89a187
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350

Change-Id: I843709e8daa6ae49417cb1749d0880ffefda6cee
2020-06-17 06:49:06 +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