Commit Graph

1224 Commits

Author SHA1 Message Date
Mark Chien
03b39c4da2 [automerger skipped] Merge "Add test for OffloadHardwareInterface" into rvc-dev am: 5d846418a7 -s ours am: 78400bf308 -s ours
am skip reason: Change-Id Ia402a6caaa0dfaa05d25a02101c515bbd884d33f with SHA-1 7c23d31127 is in history

Change-Id: I3e84b5d641917df85a4bc2e4e93ee543082d39ae
2020-05-13 12:43:02 +00:00
Mark Chien
7573a03fe7 [automerger skipped] Merge "Add test for OffloadHardwareInterface" into rvc-dev am: 5d846418a7 am: ed6b8c51fa -s ours
am skip reason: Change-Id Ia402a6caaa0dfaa05d25a02101c515bbd884d33f with SHA-1 bcaf0d61ce is in history

Change-Id: I496bec6390eb7cb4bf5e6d393703a2c801f81d9f
2020-05-13 12:42:51 +00:00
Mark Chien
78400bf308 [automerger skipped] Merge "Add test for OffloadHardwareInterface" into rvc-dev am: 5d846418a7 -s ours
am skip reason: Change-Id Ia402a6caaa0dfaa05d25a02101c515bbd884d33f with SHA-1 bcaf0d61ce is in history

Change-Id: Id0a73523ac6b951c783cd559afd662ca57fe5571
2020-05-13 12:30:08 +00:00
Mark Chien
ed6b8c51fa Merge "Add test for OffloadHardwareInterface" into rvc-dev am: 5d846418a7
Change-Id: I021c6d8b33c68ac72988233075bce37f61c2c926
2020-05-13 12:30:08 +00:00
Paul Duffin
6fb171fc7f Merge "Cleanup packages/Tethering/common/TetheringLib" am: 85bdee7daa am: 9488e5f521 am: e42763eb6f
Change-Id: I72b0250b5effcf66da8c283faf4aa9afca8b079c
2020-05-13 11:27:04 +00:00
Paul Duffin
e42763eb6f Merge "Cleanup packages/Tethering/common/TetheringLib" am: 85bdee7daa am: 9488e5f521
Change-Id: I0c19abcb8c8a909585b14e4213c59c1cef34be13
2020-05-13 11:13:26 +00:00
Paul Duffin
9488e5f521 Merge "Cleanup packages/Tethering/common/TetheringLib" am: 85bdee7daa
Change-Id: Iadf7e06945ca0b60b11805fef422f2bfa47a8e7b
2020-05-13 10:55:34 +00:00
Paul Duffin
85bdee7daa Merge "Cleanup packages/Tethering/common/TetheringLib" 2020-05-13 10:40:43 +00:00
Nucca Chen
abd70277ac [automerger skipped] Merge "Add tether BPF offload config to device config and resource" into rvc-dev am: 224b8bf27e -s ours am: 95f72d008a -s ours
am skip reason: Change-Id I2d6f80f0229f580c4b16243a064e889a6c37f77a with SHA-1 0bbfe12d92 is in history

Change-Id: Iee3ceb0c3106a609b18a994baa4613ff0f6ec6c5
2020-05-13 10:25:09 +00:00
Nucca Chen
66c4c89dcd [automerger skipped] Merge "Add tether BPF offload config to device config and resource" into rvc-dev am: 224b8bf27e am: acc87c875d -s ours
am skip reason: Change-Id I2d6f80f0229f580c4b16243a064e889a6c37f77a with SHA-1 3d8fa889b4 is in history

Change-Id: Icddb2c9ac8e0a669420466b15a68eda5f3e8948f
2020-05-13 10:24:40 +00:00
Nucca Chen
acc87c875d Merge "Add tether BPF offload config to device config and resource" into rvc-dev am: 224b8bf27e
Change-Id: I93453a575a7d28ba9d5116acc9357afea0f100fe
2020-05-13 10:12:44 +00:00
Nucca Chen
95f72d008a [automerger skipped] Merge "Add tether BPF offload config to device config and resource" into rvc-dev am: 224b8bf27e -s ours
am skip reason: Change-Id I2d6f80f0229f580c4b16243a064e889a6c37f77a with SHA-1 3d8fa889b4 is in history

Change-Id: I38e1a89e65027de9dd5e0f6d2f4d9c7c6c7cb04d
2020-05-13 10:12:14 +00:00
Mark Chien
7c23d31127 Add test for OffloadHardwareInterface
Bug: 145490751
Test: atest TetheringTests

Merged-In: Ia402a6caaa0dfaa05d25a02101c515bbd884d33f
Change-Id: Ia402a6caaa0dfaa05d25a02101c515bbd884d33f
2020-05-13 10:06:26 +00:00
Nucca Chen
224b8bf27e Merge "Add tether BPF offload config to device config and resource" into rvc-dev 2020-05-13 09:54:50 +00:00
Nucca Chen
0bbfe12d92 Add tether BPF offload config to device config and resource
The tether bpf offload can be enabled by resource config and
device config. The device config has higher priority and it
could override this config which is set by resource config.

Bug: 149997301
Test: -build, flash, boot
      -atest TetheringConfigurationTest
Original-Change: https://android-review.googlesource.com/1276007

Use device option to control BPF offload features

If BPF offload device config is not enabled:
- Does not add/remove offload forwarding rules through disabling IP
  neighbor monitor.
- Does not apply the RA MTU reduction.

Bug: 149997301
Test: atest IpServerTest
Original-Change: https://android-review.googlesource.com/1284578
Merged-In: I2d6f80f0229f580c4b16243a064e889a6c37f77a
Change-Id: I2d6f80f0229f580c4b16243a064e889a6c37f77a
2020-05-13 09:41:31 +00:00
Mark Chien
5abadb6040 Merge "Add test for OffloadHardwareInterface" am: 37b52321ee am: 9f6a0496d2 am: 2de076ce41
Change-Id: I98876aa34e283231dc37650fd3c5bf155328c6be
2020-05-13 09:14:31 +00:00
Jooyung Han
dee013a522 [automerger skipped] Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa am: 753d22c70b -s ours
am skip reason: Change-Id I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5 with SHA-1 595adc05e8 is in history

Change-Id: I4ee76216bc47f3a5c3e531ebde6d4d0a899ec513
2020-05-13 09:14:26 +00:00
Jooyung Han
ae8111e687 [automerger skipped] Set min_sdk_version for updatable mainline modules am: 5f9f31c18b am: d261c58a4a -s ours
am skip reason: Change-Id Ifaecb49a47a1f43edea3ea06e1cf704a177d1044 with SHA-1 5f9f31c18b is in history

Change-Id: I2b3b832f1dc5dd9eff729ccbf1d68fd5c11817ee
2020-05-13 09:14:23 +00:00
Jooyung Han
267ae80a3d [automerger skipped] Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa -s ours am: 6cc54c5b5c -s ours
am skip reason: Change-Id I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5 with SHA-1 482af2e2e8 is in history

Change-Id: Ia4f14c3b8538cafa45cf118ae7b7189f87927082
2020-05-13 09:14:00 +00:00
Mark Chien
2de076ce41 Merge "Add test for OffloadHardwareInterface" am: 37b52321ee am: 9f6a0496d2
Change-Id: I0e6939d5983c87f6e47d9f4cb398aa2e2ef00818
2020-05-13 09:13:59 +00:00
Paul Duffin
82e7165284 Cleanup packages/Tethering/common/TetheringLib
Merge the otherwise unused tethering-aidl-interfaces into
framework-tethering.

This is in preparation for converting to use java_sdk_library.

Bug: 155164730
Test: m droid
Change-Id: I4583539d11ba69320aa5a0dfcfee072c81affac2
2020-05-13 09:56:18 +01:00
Jooyung Han
753d22c70b Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa
Change-Id: I2491c2702fd2654de5e97073a77183807f41e492
2020-05-13 08:55:56 +00:00
Jooyung Han
d261c58a4a Set min_sdk_version for updatable mainline modules am: 5f9f31c18b
Change-Id: Ib0579b81c28adfbf9ecb54bd33385692d546db7e
2020-05-13 08:55:49 +00:00
Jooyung Han
6cc54c5b5c [automerger skipped] Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa -s ours
am skip reason: Change-Id I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5 with SHA-1 482af2e2e8 is in history

Change-Id: I2e277a8615dd97b2b104ef38313eed7eb04eb880
2020-05-13 08:55:35 +00:00
Mark Chien
9f6a0496d2 Merge "Add test for OffloadHardwareInterface" am: 37b52321ee
Change-Id: I96c13ed5ad79cc698a6835aaa2bd832eafacb68c
2020-05-13 08:55:17 +00:00
Jooyung Han
595adc05e8 InProcessTethering: set min_sdk_version
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

InProcessTethering is a part of com.android.tethering.inprocess,
therefore min_sdk_version is set.

Exempt-From-Owner-Approval: CP from AOSP

Bug: 145796956
Bug: 150999716
Test: m
Merged-In: I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5
Change-Id: I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5
(cherry picked from commit ace605ef568fecfe148d2785f4681c9c858487aa)
2020-05-13 08:45:54 +00:00
Mark Chien
37b52321ee Merge "Add test for OffloadHardwareInterface" 2020-05-13 08:39:32 +00:00
Jooyung Han
5f9f31c18b Set min_sdk_version for updatable mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 145796956
Bug: 150999716
Test: m
Merged-In: Ifaecb49a47a1f43edea3ea06e1cf704a177d1044
Change-Id: Ifaecb49a47a1f43edea3ea06e1cf704a177d1044
(cherry picked from commit 33aa294e96f13906f596e427b96652fe80cf199b)
2020-05-13 16:18:51 +09:00
markchien
bcaf0d61ce Add test for OffloadHardwareInterface
Bug: 145490751
Test: atest TetheringTests

Change-Id: Ia402a6caaa0dfaa05d25a02101c515bbd884d33f
2020-05-13 14:36:42 +08:00
Mark Chien
ce011791d4 [automerger skipped] Merge "Allow to exempt from entitlement check" into rvc-dev am: 1fe4d26b79 am: 440035ae43 -s ours
am skip reason: Change-Id I2eb37f5e92f5f5150a7fb7c25b945e28704d27a0 with SHA-1 dc3b82db70 is in history

Change-Id: Ie8fe5906b88a19f871e900eabf23b365bc186238
2020-05-12 19:46:58 +00:00
Mark Chien
440035ae43 Merge "Allow to exempt from entitlement check" into rvc-dev am: 1fe4d26b79
Change-Id: I5936d18a73dffd628075073aeebbf0369370ae1b
2020-05-12 19:40:10 +00:00
Maciej Żenczykowski
c924a86d3b Merge "A minor followup change for BPF offload device option stuff" am: 88536883e2 am: 03c8d55456 am: f243a65531
Change-Id: I467f5a4f62b7d2f21fdf8f1e1a43fb55b5e69fec
2020-05-12 19:20:19 +00:00
Mark Chien
a8a4a381ed [automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b5f am: a18a39f8b6 -s ours
am skip reason: Change-Id I0cf337625cee31a47879c59e9b18657ea7624eb4 with SHA-1 0dafa92b93 is in history

Change-Id: I19aaf17ec66ff33b2c3496e35281091708236f7c
2020-05-12 19:17:43 +00:00
Mark Chien
6ddd730196 [automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 am: 662d1a7994 -s ours
am skip reason: Change-Id Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc with SHA-1 92afd387fd is in history

Change-Id: Ic218e5027de5e4751a322c96d6cce6460cf20532
2020-05-12 19:04:40 +00:00
Maciej Żenczykowski
f243a65531 Merge "A minor followup change for BPF offload device option stuff" am: 88536883e2 am: 03c8d55456
Change-Id: Ia148434de4f497e2e90b207845ee037a65c98a02
2020-05-12 19:04:39 +00:00
Mark Chien
a18a39f8b6 Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b5f
Change-Id: I97ae5e12a900f38e8271455e48e92bdcf0708b34
2020-05-12 18:57:33 +00:00
Mark Chien
662d1a7994 Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32
Change-Id: I3b09d6077a343df3dbde5dd3b410ba1bd4267146
2020-05-12 18:53:20 +00:00
Maciej Żenczykowski
03c8d55456 Merge "A minor followup change for BPF offload device option stuff" am: 88536883e2
Change-Id: Id2f86ebd0668d27eb6002ead9f0a659b26c62c58
2020-05-12 18:52:10 +00:00
Nucca Chen
bfa2706282 Merge changes I2d6f80f0,I9c26852d am: 50522024a1 am: 6151bb7aed am: 2cc2f3b424
Change-Id: If7ab7dbfb3b4c90e8ef58f0d38690bcc9fc8a1b3
2020-05-12 11:47:19 +00:00
Nucca Chen
2cc2f3b424 Merge changes I2d6f80f0,I9c26852d am: 50522024a1 am: 6151bb7aed
Change-Id: I52c3ba5b46dc6e52307f68c9201fc19b0a368a09
2020-05-12 11:34:28 +00:00
Nucca Chen
6151bb7aed Merge changes I2d6f80f0,I9c26852d am: 50522024a1
Change-Id: I584138925bf090c1c4b600fc2327220d7e5e39c9
2020-05-12 11:24:05 +00:00
Hungming Chen
5bc3af9a57 A minor followup change for BPF offload device option stuff
- Correct description and spelling in the code and xml files.
- Add a TODO for refactoring the IpServer constructor.
- Refine the if-statement for starting IP neighbor monitor.

Test: atest IpServerTest
Change-Id: If9c8bc6f785fa80575db56de4e223292e9807ace
2020-05-12 19:15:24 +08:00
Nucca Chen
50522024a1 Merge changes I2d6f80f0,I9c26852d
* changes:
  Use device option to control BPF offload features
  Add tether BPF offload config to device config and resource
2020-05-12 11:00:04 +00:00
Treehugger Robot
a9aad8b5b4 Merge "InProcessTethering: set min_sdk_version" am: 932b0b27b6 am: 2e6ffb2465 am: 2a451d4d00
Change-Id: Id265e9163917dfc9208c85146f4d4fef280fbf1b
2020-05-11 10:12:00 +00:00
Treehugger Robot
2a451d4d00 Merge "InProcessTethering: set min_sdk_version" am: 932b0b27b6 am: 2e6ffb2465
Change-Id: Id459eb2852e451c62c015e033f75df58dbd43204
2020-05-11 09:52:22 +00:00
Treehugger Robot
2e6ffb2465 Merge "InProcessTethering: set min_sdk_version" am: 932b0b27b6
Change-Id: I0a824c6f6cc10faf3ced1135ab288c2ff2e94e8b
2020-05-11 09:34:42 +00:00
Jooyung Han
482af2e2e8 InProcessTethering: set min_sdk_version
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

InProcessTethering is a part of com.android.tethering.inprocess,
therefore min_sdk_version is set.

Bug: 145796956
Bug: 150999716
Test: m
Change-Id: I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5
2020-05-11 13:18:29 +09:00
Mark Chien
7cba9ab79b [automerger skipped] Merge "Allow to exempt from entitlement check" into rvc-dev am: 1fe4d26b79 -s ours am: f9a761f7f5 -s ours
am skip reason: Change-Id I2eb37f5e92f5f5150a7fb7c25b945e28704d27a0 with SHA-1 f5078f489d is in history

Change-Id: Id47bc36006f51843ee5571cfc981a69ddd0eacb3
2020-05-11 03:29:54 +00:00
Mark Chien
f9a761f7f5 [automerger skipped] Merge "Allow to exempt from entitlement check" into rvc-dev am: 1fe4d26b79 -s ours
am skip reason: Change-Id I2eb37f5e92f5f5150a7fb7c25b945e28704d27a0 with SHA-1 f5078f489d is in history

Change-Id: If7cdf06b3d14e3bdcb9cc977f388ae67db46ea79
2020-05-11 03:11:23 +00:00
TreeHugger Robot
23845f33b3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 884dbdadf0 -s ours
am skip reason: subject contains skip directive

Change-Id: I9e823ec0a2bab83e33f185b5e883b31a4585ba54
2020-05-10 06:10:29 +00:00