Commit Graph

1584 Commits

Author SHA1 Message Date
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
Mark Chien
8bf0388721 [automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 am: 662d1a7994 am: 5cc78e91cc -s ours
am skip reason: Change-Id Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc with SHA-1 92afd387fd is in history

Change-Id: Ie89610f02877f033e0cd676ed949984ad709ae22
2020-05-12 19:20:14 +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
8756467fb7 Merge changes I2d6f80f0,I9c26852d am: 50522024a1 am: 6151bb7aed am: 2cc2f3b424 am: bfa2706282
Change-Id: Id96e16934fec482dad5a9a6aba5100ceddf1cca1
2020-05-12 12:03:41 +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
d1fdd5d965 Merge "InProcessTethering: set min_sdk_version" am: 932b0b27b6 am: 2e6ffb2465 am: 2a451d4d00 am: a9aad8b5b4
Change-Id: I19245ccfde440f7c171dc5454f134d73adb924dc
2020-05-11 10:27:10 +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
6bb51c1e9f [automerger skipped] Merge "Allow to exempt from entitlement check" into rvc-dev am: 1fe4d26b79 -s ours am: f9a761f7f5 -s ours am: 7cba9ab79b -s ours
am skip reason: Change-Id I2eb37f5e92f5f5150a7fb7c25b945e28704d27a0 with SHA-1 f5078f489d is in history

Change-Id: I252d9251c22deabc1d203226bb8e160e46b6686e
2020-05-11 03:41:26 +00: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
579ab5476f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 884dbdadf0 -s ours am: 23845f33b3 -s ours
am skip reason: subject contains skip directive

Change-Id: Idc7130946f767995994e31139ee26d485bbc3827
2020-05-10 06:27:30 +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
Bill Yi
c8005575bf Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I5d700a2f66a5a5e5419c46926034f48a690438ae
2020-05-10 00:00:53 +00:00
markchien
dc3b82db70 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
Merged-In: I2eb37f5e92f5f5150a7fb7c25b945e28704d27a0
2020-05-08 23:13:30 +08:00
Mark Chien
c47e66c6dd [automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b5f -s ours am: e37bb0c05a -s ours am: 36dd27fedd -s ours
am skip reason: Change-Id I0cf337625cee31a47879c59e9b18657ea7624eb4 with SHA-1 147e5765ee is in history

Change-Id: Idbc32aeefbfff59383552c92c7409c73ba874e66
2020-05-08 13:40:36 +00:00
Mark Chien
36dd27fedd [automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b5f -s ours am: e37bb0c05a -s ours
am skip reason: Change-Id I0cf337625cee31a47879c59e9b18657ea7624eb4 with SHA-1 147e5765ee is in history

Change-Id: I5ba676c0b42927d4e136f9e335b4b609e6c7786a
2020-05-08 13:23:33 +00:00
Mark Chien
e37bb0c05a [automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b5f -s ours
am skip reason: Change-Id I0cf337625cee31a47879c59e9b18657ea7624eb4 with SHA-1 147e5765ee is in history

Change-Id: I017e1107ddec8b7700eb0bf64c21436bd7813fc1
2020-05-08 13:16:43 +00:00
Mark Chien
48ecdd0891 Merge "Allow to exempt from entitlement check" am: 469314ecc8 am: ec7cf5e356 am: fa0384ea72 am: 27b296db53
Change-Id: I0368770268547568bb8353f5613a1ead1ed0146b
2020-05-08 13:07:56 +00:00
Treehugger Robot
607ebd5b7f [automerger skipped] Merge "Override tethering module APK-in-APEX for Go variant" am: bfd392c4c0 am: b8345314d8 -s ours am: f21b93a7f2 -s ours am: 896b666cf4 -s ours
am skip reason: Change-Id I4147173b5f3668491ff9cb7f1f86715b036d6d4b with SHA-1 9548c8580c is in history

Change-Id: I405a67cc3184fdacc52be43b7f870fb99ecf2e54
2020-05-08 13:07:36 +00:00
Mark Chien
27b296db53 Merge "Allow to exempt from entitlement check" am: 469314ecc8 am: ec7cf5e356 am: fa0384ea72
Change-Id: Iad0dfaef007cc48b97124c5c4a530fbbe8510802
2020-05-08 12:53:17 +00:00
Treehugger Robot
896b666cf4 [automerger skipped] Merge "Override tethering module APK-in-APEX for Go variant" am: bfd392c4c0 am: b8345314d8 -s ours am: f21b93a7f2 -s ours
am skip reason: Change-Id I4147173b5f3668491ff9cb7f1f86715b036d6d4b with SHA-1 9548c8580c is in history

Change-Id: I96daf51b120704190366ec1a99c3e5d2390d49b4
2020-05-08 12:53:08 +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
Treehugger Robot
f21b93a7f2 [automerger skipped] Merge "Override tethering module APK-in-APEX for Go variant" am: bfd392c4c0 am: b8345314d8 -s ours
am skip reason: Change-Id I4147173b5f3668491ff9cb7f1f86715b036d6d4b with SHA-1 9548c8580c is in history

Change-Id: I115a3426c92c4c7bfe78e3318b6ecf6cfcbe2d5d
2020-05-08 12:47:29 +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
0dafa92b93 Address the comment of aosp/1288493
Bug: 141256482
Test: atest TetheringTests
Merged-In: I0cf337625cee31a47879c59e9b18657ea7624eb4
Change-Id: I0cf337625cee31a47879c59e9b18657ea7624eb4
2020-05-08 11:57:57 +00:00
Mark Chien
80fa790913 Merge "Address the comment of aosp/1288493" am: 974d6f5978 am: b51ef98b86 am: 250a10eec4 am: 4fa682fe4e
Change-Id: I978c6d5cb9ccf6bda4b8197043f30adeb581e59e
2020-05-08 11:36:39 +00:00
Mark Chien
4fa682fe4e Merge "Address the comment of aosp/1288493" am: 974d6f5978 am: b51ef98b86 am: 250a10eec4
Change-Id: Iea3ae73bdafc8ca3be77be23e70ba86ab623a128
2020-05-08 11:17:58 +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
Mark Chien
974d6f5978 Merge "Address the comment of aosp/1288493" 2020-05-08 10:30:49 +00:00