Commit Graph

1629 Commits

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

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

Change-Id: I3c52c06fcccbe7bf2dd139c5ec8516ec54d80fcd
2020-05-13 12:54:57 +00:00
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
0fffda7f4f Merge "Cleanup packages/Tethering/common/TetheringLib" am: 85bdee7daa am: 9488e5f521 am: e42763eb6f am: 6fb171fc7f
Change-Id: I6b1d072c6f1f19cf94ec7abf5820d7af68b4ce98
2020-05-13 11:46:23 +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
917650b62b [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: abd70277ac -s ours
am skip reason: Change-Id I2d6f80f0229f580c4b16243a064e889a6c37f77a with SHA-1 0bbfe12d92 is in history

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

Change-Id: I519da97553367007b726dfad884df861efe90ed7
2020-05-13 10:39:09 +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
f44a0dace6 Merge "Add test for OffloadHardwareInterface" am: 37b52321ee am: 9f6a0496d2 am: 2de076ce41 am: 5abadb6040
Change-Id: Iabc10d1e33b7d3733475ad674422d9ebd1b842ee
2020-05-13 09:30:54 +00:00
Automerger Merge Worker
f812b381dd Merge changes from topic "am-fbf760d15b9847d0a81afc48aec25dc1" into rvc-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa am: 753d22c70b -s ours am: dee013a522 -s ours
  [automerger skipped] Set min_sdk_version for updatable mainline modules am: 5f9f31c18b am: d261c58a4a -s ours am: ae8111e687 -s ours
2020-05-13 09:30:11 +00:00
Jooyung Han
572125f28b [automerger skipped] Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa am: 753d22c70b -s ours am: dee013a522 -s ours
am skip reason: Change-Id I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5 with SHA-1 595adc05e8 is in history

Change-Id: I866888510c08a2956f030c78a108733798f8b0ff
2020-05-13 09:30:01 +00:00
Jooyung Han
0c68e047bb [automerger skipped] Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa am: 753d22c70b am: 503df111ce -s ours
am skip reason: Change-Id I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5 with SHA-1 595adc05e8 is in history

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

Change-Id: I027cdf81625f28c4afad74096657ffcf3cbd641f
2020-05-13 09:29:52 +00:00
Jooyung Han
fe6952e4e9 [automerger skipped] Set min_sdk_version for updatable mainline modules am: 5f9f31c18b am: d261c58a4a am: 25ba30bb31 -s ours
am skip reason: Change-Id Ifaecb49a47a1f43edea3ea06e1cf704a177d1044 with SHA-1 5f9f31c18b is in history

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

Change-Id: I53f0f74c430b0e0184cad0d8e41bfcb322a1dc94
2020-05-13 09:29:12 +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
740d5c643c [automerger skipped] Merge "Allow to exempt from entitlement check" into rvc-dev am: 1fe4d26b79 am: 440035ae43 -s ours am: ce011791d4 -s ours
am skip reason: Change-Id I2eb37f5e92f5f5150a7fb7c25b945e28704d27a0 with SHA-1 dc3b82db70 is in history

Change-Id: I1af6ac97bef8e211e49e86b8c07905412c158523
2020-05-12 19:55:22 +00:00
Mark Chien
d9843b838d [automerger skipped] Merge "Allow to exempt from entitlement check" into rvc-dev am: 1fe4d26b79 am: 440035ae43 am: c82616a2cc -s ours
am skip reason: Change-Id I2eb37f5e92f5f5150a7fb7c25b945e28704d27a0 with SHA-1 dc3b82db70 is in history

Change-Id: I522f8604202a44071d598176079f7962c4d17f73
2020-05-12 19:50:28 +00: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
Automerger Merge Worker
1ad9df62dd Merge "Merge "A minor followup change for BPF offload device option stuff" am: 88536883e2 am: 03c8d55456 am: f243a65531" into rvc-d1-dev-plus-aosp am: 89230707cf
Change-Id: I343b1a949f2382b61bb7d2b72ef459123d733fc0
2020-05-12 19:27:31 +00:00
Mark Chien
c769950a48 [automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b5f am: a18a39f8b6 -s ours am: a8a4a381ed -s ours
am skip reason: Change-Id I0cf337625cee31a47879c59e9b18657ea7624eb4 with SHA-1 0dafa92b93 is in history

Change-Id: Iaca920aa35f263f0e73e818f8e663d493e42a5f3
2020-05-12 19:23:40 +00:00
Automerger Merge Worker
8eb924661a Merge "[automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 am: 662d1a7994 -s ours am: 6ddd730196 -s ours" into rvc-qpr-dev-plus-aosp 2020-05-12 19:20:26 +00:00
Mark Chien
1094aef111 [automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 am: 662d1a7994 -s ours am: 6ddd730196 -s ours
am skip reason: Change-Id Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc with SHA-1 92afd387fd is in history

Change-Id: I1f511a6610c55c02c2a9e5f0cd5c54ee80799064
2020-05-12 19:20:21 +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