Commit Graph

755 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
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
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
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
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
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
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
Mark Chien
63182642fb Merge "Add test for OffloadHardwareInterface" am: 37b52321ee am: 9f6a0496d2 am: 2de076ce41 am: 5abadb6040 am: f44a0dace6
Change-Id: Ic8c686dcb5808b6b4285896b52de3e987e8d8e93
2020-05-13 09:49:29 +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
Mark Chien
9f6a0496d2 Merge "Add test for OffloadHardwareInterface" am: 37b52321ee
Change-Id: I96c13ed5ad79cc698a6835aaa2bd832eafacb68c
2020-05-13 08:55:17 +00:00
Mark Chien
37b52321ee Merge "Add test for OffloadHardwareInterface" 2020-05-13 08:39:32 +00:00
markchien
569870320a 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
2020-05-13 15:51:11 +08:00
markchien
bcaf0d61ce Add test for OffloadHardwareInterface
Bug: 145490751
Test: atest TetheringTests

Change-Id: Ia402a6caaa0dfaa05d25a02101c515bbd884d33f
2020-05-13 14:36:42 +08:00
Automerger Merge Worker
fd652cafaa 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 am: 1ad9df62dd
Change-Id: I4ec5151a20e272153c27fa1b9ee345cf399268fb
2020-05-12 19:37:06 +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
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
03f328a76b Merge changes I2d6f80f0,I9c26852d am: 50522024a1 am: 6151bb7aed am: 2cc2f3b424 am: bfa2706282 am: 8756467fb7
Change-Id: I5899298597fd2fce44c4093338ad19df51b15eb1
2020-05-12 12:17:41 +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
408643dec8 Merge "InProcessTethering: set min_sdk_version" am: 932b0b27b6 am: 2e6ffb2465 am: 2a451d4d00 am: a9aad8b5b4 am: d1fdd5d965
Change-Id: I2890efe8442590641c820ab2e4981a412e57a99d
2020-05-11 10:57:13 +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
2022ffdcfb Merge "Allow to exempt from entitlement check" am: 469314ecc8 am: ec7cf5e356 am: fa0384ea72 am: 27b296db53 am: 48ecdd0891
Change-Id: I747dc832886ba5daf4b0657bac424370f8f89780
2020-05-08 13:23:37 +00:00
Mark Chien
fa0384ea72 Merge "Allow to exempt from entitlement check" am: 469314ecc8 am: ec7cf5e356
Change-Id: I34a405492bd2e80aa731e5ac5d56034f7a80cd45
2020-05-08 12:47:48 +00:00
Mark Chien
ec7cf5e356 Merge "Allow to exempt from entitlement check" am: 469314ecc8
Change-Id: I1252b9670efa16118d428cda2ab94e2dca757090
2020-05-08 12:29:58 +00:00
Treehugger Robot
b8345314d8 Merge "Override tethering module APK-in-APEX for Go variant" am: bfd392c4c0
Change-Id: Iff6db0c1f58356a0e573654175c3780b8fa09a66
2020-05-08 12:29:38 +00:00
Mark Chien
469314ecc8 Merge "Allow to exempt from entitlement check" 2020-05-08 12:28:06 +00:00
Treehugger Robot
bfd392c4c0 Merge "Override tethering module APK-in-APEX for Go variant" 2020-05-08 12:11:47 +00:00
Mark Chien
cb74eedb1c Merge "Address the comment of aosp/1288493" am: 974d6f5978 am: b51ef98b86 am: 250a10eec4 am: 4fa682fe4e am: 80fa790913
Change-Id: I3cb7b968362ebc7d629a617165683dcc17add228
2020-05-08 11:55:16 +00:00
Mark Chien
250a10eec4 Merge "Address the comment of aosp/1288493" am: 974d6f5978 am: b51ef98b86
Change-Id: Idfe4cbf12cbcc233c1061b26e962dcf21cd36de0
2020-05-08 11:00:42 +00:00
markchien
f5078f489d Allow to exempt from entitlement check
To exempt from entitlement check, caller need to hold TETHER_PRIVILEGED
permission.

Bug: 141256482
Test: atest TetheringTests

Change-Id: I2eb37f5e92f5f5150a7fb7c25b945e28704d27a0
2020-05-08 18:55:26 +08:00
Mark Chien
b51ef98b86 Merge "Address the comment of aosp/1288493" am: 974d6f5978
Change-Id: I706462c5dc4a0dbd4b921f2c446a13b1b408948a
2020-05-08 10:45:12 +00:00
Jooyung Han
aea37a492d Merge "Set min_sdk_version for updatable mainline modules" am: 50f4887299 am: e25536866e am: 669772eb76 am: 5f2f34a042 am: a0428f67ae
Change-Id: I1c8bde4023857acd1b9ab95bfa6fe4e445e9b884
2020-05-08 10:44:56 +00:00
Mark Chien
974d6f5978 Merge "Address the comment of aosp/1288493" 2020-05-08 10:30:49 +00:00
Jooyung Han
669772eb76 Merge "Set min_sdk_version for updatable mainline modules" am: 50f4887299 am: e25536866e
Change-Id: I3152d9e94e0a1fce02ecb16b3ec0cea92c856ebe
2020-05-08 09:40:48 +00:00
Jooyung Han
e25536866e Merge "Set min_sdk_version for updatable mainline modules" am: 50f4887299
Change-Id: I30b90b19967d2a4cd8e283420f856816c3e4bbb4
2020-05-08 09:04:30 +00:00
Jooyung Han
50f4887299 Merge "Set min_sdk_version for updatable mainline modules" 2020-05-08 08:45:49 +00:00
markchien
147e5765ee Address the comment of aosp/1288493
Bug: 141256482
Test: atest TetheringTests
Change-Id: I0cf337625cee31a47879c59e9b18657ea7624eb4
2020-05-08 15:51:52 +08:00
Automerger Merge Worker
7fbf82a855 Merge "Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882 am: b853a6e5db am: 501f46a9d0" into rvc-qpr-dev-plus-aosp am: 4f895631bf
Change-Id: I0b56380970960d7d9dc7819e2eda23d915af386b
2020-05-07 15:48:01 +00:00