Commit Graph

2062 Commits

Author SHA1 Message Date
TreeHugger Robot
dfd01604c0 [automerger skipped] Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" into rvc-dev am: 3358560be8 am: 8fd0b8bcf2 -s ours am: 3caed31afc -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: I52164733a836f100eb41616e90ef4737ffa8419f
2020-06-18 15:16:43 +00:00
TreeHugger Robot
d5576fdd0a [automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838 am: 744e7cd238 -s ours am: 3425b6bf39 -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: I2a60c9dd4e1c76def1717ca50a325f4ba76b0066
2020-06-18 15:16:13 +00:00
Nucca Chen
c34bb396ec [automerger skipped] [BOT.8] Dump BPF offload information in dumpsys am: a340f25d3e am: 9d19ebf408 -s ours am: 63df5ec43a -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: I756a44fbb684cc03954fa25df4bd58c5d52d7d8a
2020-06-18 15:16:05 +00:00
Nucca Chen
277efa496d [automerger skipped] [BOT.10] Add unit test for data limit and rule change in BpfCoordinator am: 2fbc671d4a am: f7257aaec8 -s ours am: bc63b4f34d -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: I1df6ff4d9fc7d33f8e2a1160e2e26664667f757b
2020-06-18 15:16:01 +00:00
TreeHugger Robot
3caed31afc [automerger skipped] Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" into rvc-dev am: 3358560be8 am: 8fd0b8bcf2 -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: I20b7e19321116b896bf5a3c7aa16092d6d1d76ae
2020-06-18 14:54:51 +00:00
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
Automerger Merge Worker
cb1bfbbca6 Merge "Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 0382ca9dc1 am: 18e59cdc1d" into rvc-qpr-dev-plus-aosp 2020-06-18 14:54:32 +00:00
Mark Chien
2fb5a9d1f1 Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 0382ca9dc1 am: 18e59cdc1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350

Change-Id: If981217ab2887f0ff7257d1dc22edf61300ed6f2
2020-06-18 14:54:24 +00:00
Mark Chien
378d882052 Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 0382ca9dc1 am: c50a851e80
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350

Change-Id: Ia3edcd1a22eacad68a319d41d59251d3dd502f1c
2020-06-18 14:54:17 +00:00
TreeHugger Robot
8fd0b8bcf2 Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" into rvc-dev am: 3358560be8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11883504

Change-Id: If985e431f6266777486375bc02dec9b30bd52211
2020-06-18 14:50:56 +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
d5cd1b71ee Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: 7b5f30d3a4 am: b073d590ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076

Change-Id: If4aac5b57ca1a63d315e6ba5320f99acf88779ea
2020-06-18 14:46:31 +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
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
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
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
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
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