Commit Graph

2030 Commits

Author SHA1 Message Date
Xiao Ma
80ec78bb44 Merge "Support MirrorLink DHCPDECLINE." am: cc755bf9fc am: b80b1e09bc am: cad22f9192 am: 18189bfea0 am: a4f37e240d
Change-Id: Ie2db62c6edb0da22ca6866bb9013c2dc7c7c9a45
2020-05-14 07:29:25 +00:00
Xiao Ma
a4f37e240d Merge "Support MirrorLink DHCPDECLINE." am: cc755bf9fc am: b80b1e09bc am: cad22f9192 am: 18189bfea0
Change-Id: I4a5820ecddfd8358bd116408936baa35be91a0d4
2020-05-14 07:15:10 +00: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
ba953797dc [automerger skipped] Merge "Make members final in TetheringService" am: 7e2180f019 am: 6636efb050 -s ours am: 41a5e3114a -s ours am: 8a92d0307c -s ours am: b9d655ace9 -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 bd2cbe6c73 is in history

Change-Id: I5031fffc1c7c7ee426fed0616e32cd5aceb269f9
2020-05-13 17:22:46 +00:00
Mark Chien
9e891a73e0 [automerger skipped] Merge "Make members final in TetheringService" into rvc-dev-plus-aosp am: 997648de38 am: 1c4d9eda63 am: cfa33ab68a -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 569870320a is in history

Change-Id: Id168f35d5f259a263c6306bb4c877bf3baf9fd07
2020-05-13 17:17:02 +00:00
Nucca Chen
7100508bbe [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: b7474012d9 -s ours am: 91f0ca6280 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 fd8b4bbe35 is in history

Change-Id: Ib166a10aa1e59714d2c347f2e71be69caa6e0f43
2020-05-13 17:14:53 +00:00
Nucca Chen
392cc83841 [automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5 am: 9aba72f7b8 -s ours am: 0f0a6345d2 -s ours am: 77a9bd5500 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 fd8b4bbe35 is in history

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

Change-Id: Ie1948fd7a3f538fdf774b7b9c919a20ebc4e1a5f
2020-05-13 16:58:18 +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
Mark Chien
cfa33ab68a Merge "Make members final in TetheringService" into rvc-dev-plus-aosp am: 997648de38 am: 1c4d9eda63
Change-Id: Ifff12119e299657746a04211774b31b50c0c73ed
2020-05-13 16:27:26 +00:00
Nucca Chen
91f0ca6280 [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: b7474012d9 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 fd8b4bbe35 is in history

Change-Id: I626aca430073c9cf8258ec1045006c7a131f0bae
2020-05-13 16:25:53 +00:00
Nucca Chen
5064beba67 [automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5 am: 9aba72f7b8 am: b185a77dc0 -s ours am: 0329395cf7 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 5bc3af9a57 is in history

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

Change-Id: I147eb4acc871d3b2444c32573a56e0316d0db245
2020-05-13 16:25:03 +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
Nucca Chen
0329395cf7 [automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5 am: 9aba72f7b8 am: b185a77dc0 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 5bc3af9a57 is in history

Change-Id: I5cda7e555e8217e420bb7296a8ee431e77e4570c
2020-05-13 16:02:35 +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
Paul Duffin
1b2c0e9dfb [automerger skipped] Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461 -s ours am: 2105fe72f5 -s ours am: 7da2f31705 -s ours am: 86407a0a26 -s ours
am skip reason: Change-Id I4583539d11ba69320aa5a0dfcfee072c81affac2 with SHA-1 b016744a1a is in history

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

Change-Id: I6ad54edb088b0a4f9bf4672d15f25035339793b8
2020-05-13 15:33:54 +00:00
Paul Duffin
86407a0a26 [automerger skipped] Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461 -s ours am: 2105fe72f5 -s ours am: 7da2f31705 -s ours
am skip reason: Change-Id I4583539d11ba69320aa5a0dfcfee072c81affac2 with SHA-1 b016744a1a is in history

Change-Id: Ic57efc95c3199fd9090f286f738c0de904a433fb
2020-05-13 15:19:46 +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
Paul Duffin
4dc2752395 [automerger skipped] Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461 am: a6fe2f4797 -s ours am: 1c15bee4c0 -s ours
am skip reason: Change-Id I4583539d11ba69320aa5a0dfcfee072c81affac2 with SHA-1 82e7165284 is in history

Change-Id: I321fd125ab550635fa1a32efb9bc571acb9d3b96
2020-05-13 15:19:34 +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
45decbd6cf [automerger skipped] Merge "Add test for OffloadHardwareInterface" into rvc-dev am: 5d846418a7 -s ours am: 78400bf308 -s ours am: 03b39c4da2 -s ours am: aabd939445 -s ours
am skip reason: Change-Id Ia402a6caaa0dfaa05d25a02101c515bbd884d33f with SHA-1 7c23d31127 is in history

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

Change-Id: Ie71e41e8559a710f398adb08690d085d791437f2
2020-05-13 12:55:55 +00:00
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
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
Mark Chien
ce16229813 Merge "Make members final in TetheringService" 2020-05-13 12:23:39 +00:00
Paul Duffin
aacd7ec159 Merge "Cleanup packages/Tethering/common/TetheringLib" am: 85bdee7daa am: 9488e5f521 am: e42763eb6f am: 6fb171fc7f am: 0fffda7f4f
Change-Id: I8b19ff825442e1c9814290d871236bce4b10d9fe
2020-05-13 11:58:45 +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