Commit Graph

1253 Commits

Author SHA1 Message Date
Treehugger Robot
8620df0331 Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" am: fb2caff580 am: 61aba704a9 am: dd8e64609a
Change-Id: I09cf0b243adb6a8a1989d1cacb64c002e52c047e
2020-05-14 16:48:11 +00:00
Treehugger Robot
dd8e64609a Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" am: fb2caff580 am: 61aba704a9
Change-Id: I246e4f0d90e95418cbf55db5b802997faf4eae66
2020-05-14 16:33:30 +00:00
Treehugger Robot
61aba704a9 Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" am: fb2caff580
Change-Id: Id517f4122c4b078d16035274e8979247bc0b40f8
2020-05-14 16:18:24 +00:00
Treehugger Robot
fb2caff580 Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" 2020-05-14 16:00:27 +00:00
markchien
74174690d1 Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests
Bug: 156557122
Test: atest TetheringTests

Change-Id: Id9c0397306f3872fc23520d1354f338035a96dc9
2020-05-14 16:42:22 +08:00
Xiao Ma
18189bfea0 Merge "Support MirrorLink DHCPDECLINE." am: cc755bf9fc am: b80b1e09bc am: cad22f9192
Change-Id: Ife81d2f70d9746a37962a44a157d8314e9f230a0
2020-05-14 07:03:46 +00:00
Xiao Ma
cad22f9192 Merge "Support MirrorLink DHCPDECLINE." am: cc755bf9fc am: b80b1e09bc
Change-Id: I415ba816492a329d5632e49025284d700b3c14da
2020-05-14 06:52:59 +00:00
Xiao Ma
b80b1e09bc Merge "Support MirrorLink DHCPDECLINE." am: cc755bf9fc
Change-Id: I7082734a50da23488d1369dd6390f7c0ec2c1e0b
2020-05-14 06:41:36 +00:00
Xiao Ma
cc755bf9fc Merge "Support MirrorLink DHCPDECLINE." 2020-05-14 06:27:16 +00:00
Treehugger Robot
8a92d0307c [automerger skipped] Merge "Make members final in TetheringService" am: 7e2180f019 am: 6636efb050 -s ours am: 41a5e3114a -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 bd2cbe6c73 is in history

Change-Id: I90080b06374765008d228e7dcd54c9e3dc62e4ce
2020-05-13 16:30:59 +00:00
Treehugger Robot
41a5e3114a [automerger skipped] Merge "Make members final in TetheringService" am: 7e2180f019 am: 6636efb050 -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 bd2cbe6c73 is in history

Change-Id: I521d758718b53c2e455e84acc69f703a082dddf2
2020-05-13 16:29:13 +00:00
Treehugger Robot
6636efb050 Merge "Make members final in TetheringService" am: 7e2180f019
Change-Id: I64e0d2512a31310948cdd106943d9f7345209fb7
2020-05-13 16:14:28 +00:00
Treehugger Robot
7e2180f019 Merge "Make members final in TetheringService" 2020-05-13 16:04:58 +00:00
Mark Chien
1c4d9eda63 Merge "Make members final in TetheringService" into rvc-dev-plus-aosp am: 997648de38
Change-Id: I765e771b33787d905a6c22396fa26221e9f7957f
2020-05-13 15:58:42 +00:00
Mark Chien
997648de38 Merge "Make members final in TetheringService" into rvc-dev-plus-aosp 2020-05-13 15:54:16 +00:00
Nucca Chen
b7474012d9 [automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5 -s ours am: e49e3dd8d6 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 fd8b4bbe35 is in history

Change-Id: I66d4cca9205a4e56f15edb92f9772127d7c2535d
2020-05-13 15:39:17 +00:00
Nucca Chen
0f0a6345d2 [automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5 am: 9aba72f7b8 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 5bc3af9a57 is in history

Change-Id: I7cfe54127b3f62a211a6fc6f591d8d6a61c9ed11
2020-05-13 15:39:04 +00:00
Nucca Chen
e49e3dd8d6 [automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 5bc3af9a57 is in history

Change-Id: I3db1b057e79f59a653d925e9e2116d3415d5307d
2020-05-13 15:19:44 +00:00
Nucca Chen
9aba72f7b8 Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5
Change-Id: I92b45a1b7d3cb6b05bfb8abd28111d9f0ad3e1a4
2020-05-13 15:19:42 +00:00
markchien
bd2cbe6c73 Make members final in TetheringService
1. Move isTetheringSupport logic from TetheringService to Tethering.
2. Small readability improvement in TetheringTest. Also change
config_tether_upstream_automatic from false to true in TetheringTest.
So TetheringTests would default run automatic select upstream flow
instead of selecting by legacy perferred network type list.

Bug: 153609486
Test: atest TetheringTest
Change-Id: I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f
Merged-In: I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f
(cherry picked from commit 569870320a)
2020-05-13 15:07:00 +00:00
Paul Duffin
7da2f31705 [automerger skipped] Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461 -s ours am: 2105fe72f5 -s ours
am skip reason: Change-Id I4583539d11ba69320aa5a0dfcfee072c81affac2 with SHA-1 b016744a1a is in history

Change-Id: I94c6c4d2bb1f9561adfc94054c9017f352b4e473
2020-05-13 15:02:54 +00:00
Paul Duffin
1c15bee4c0 [automerger skipped] Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461 am: a6fe2f4797 -s ours
am skip reason: Change-Id I4583539d11ba69320aa5a0dfcfee072c81affac2 with SHA-1 82e7165284 is in history

Change-Id: I87073ac1fd13a2bc5d6dbbaeb1ffb09c8dcadd73
2020-05-13 15:02:42 +00:00
Nucca Chen
8517d037e5 Merge "A minor followup change for BPF offload device option stuff" into rvc-dev 2020-05-13 14:58:34 +00:00
Paul Duffin
a6fe2f4797 Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461
Change-Id: I5d84b91a5aa123db4d988beb9ee287e52186e8d8
2020-05-13 14:47:57 +00:00
Paul Duffin
2105fe72f5 [automerger skipped] Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461 -s ours
am skip reason: Change-Id I4583539d11ba69320aa5a0dfcfee072c81affac2 with SHA-1 82e7165284 is in history

Change-Id: Ie55bd4c01469bae5361da8f692c9e17121379d4a
2020-05-13 14:47:54 +00:00
Xiao Ma
4455d6b1bd Support MirrorLink DHCPDECLINE.
Add the specific implementation of onNewPrefixRequest callback
on IpServer side, also refactor some common code.

Bug: 130741856
Test: atest TetheringTests
Change-Id: If2871bf899cb5890bbfee18063a194c92b6f474e
2020-05-13 23:29:49 +09:00
Paul Duffin
b016744a1a 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
Merged-In: I4583539d11ba69320aa5a0dfcfee072c81affac2
Change-Id: I4583539d11ba69320aa5a0dfcfee072c81affac2
(cherry picked from commit 267dd95c3e93f75c42c3f4e5cf576829b528f6c2)
2020-05-13 13:57:12 +01: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
ed6b8c51fa Merge "Add test for OffloadHardwareInterface" into rvc-dev am: 5d846418a7
Change-Id: I021c6d8b33c68ac72988233075bce37f61c2c926
2020-05-13 12:30:08 +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
markchien
1da5f7d499 Make members final in TetheringService
1. Move isTetheringSupport logic from TetheringService to Tethering.
2. Small readability improvement in TetheringTest. Also change
config_tether_upstream_automatic from false to true in TetheringTest.
So TetheringTests would default run automatic select upstream flow
instead of selecting by legacy perferred network type list.

Bug: 153609486
Test: atest TetheringTest
Change-Id: I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f
Merged-In: I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f
2020-05-13 12:25:15 +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
Maciej Żenczykowski
fd8b4bbe35 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.

Bug: 149997301
Test: atest IpServerTest
Original-Change: https://android-review.googlesource.com/1309273
Merged-In: If9c8bc6f785fa80575db56de4e223292e9807ace
Change-Id: If9c8bc6f785fa80575db56de4e223292e9807ace
2020-05-13 10:06:47 +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