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
Mark Chien
5dcf25ba5a
Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882 am: b853a6e5db am: 501f46a9d0
...
Change-Id: I2654299f58f7e99163f68a6f800ee989627de565
2020-05-07 15:42:29 +00:00
Mark Chien
271110a1a4
Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882
...
Change-Id: Ib0d07f544a37d24f08355f3e3a2afa73fb43868d
2020-05-07 15:31:50 +00:00
Mark Chien
b853a6e5db
Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882
...
Change-Id: I4513b6ad6895b7d2ddeff5405742f578baec700f
2020-05-07 15:31:32 +00:00
Mark Chien
cca6aad882
Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev
2020-05-07 15:15:59 +00:00
TreeHugger Robot
cb50fc9690
Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da
...
Change-Id: I621dcbf0c11a3220d996c952639383b4351d67fd
2020-05-07 15:03:01 +00:00
Mark Chien
7cb74ed13c
Merge "Refactor the EntitlementManager" am: 581afa0bfa am: 407c3afa4a am: 0245317764 am: e7e06794c8 am: d7402f798a
...
Change-Id: I1de0c20b091a2c2e711ba9e880da971779f3661d
2020-05-07 11:55:05 +00:00
Jeongik Cha
600c2070b6
Merge "Use stable networkstack-aidl-interfaces" am: 3a22b81ccf am: d12236a66f am: 8841f71995 am: d307002162 am: 301f1bdb09
...
Change-Id: I52517653f238e714716b914cc99c65d8e1118590
2020-05-07 11:54:41 +00:00
Jeongik Cha
1aba7987de
Use stable networkstack-aidl-interfaces
...
Test: m nothing
Bug: 133526962
Original-Change: https://android-review.googlesource.com/1301313
Merged-In: I507f40866d04db5ed3361831e01eaa4dfaf20bed
Change-Id: I507f40866d04db5ed3361831e01eaa4dfaf20bed
2020-05-07 11:48:44 +00:00
Mark Chien
0245317764
Merge "Refactor the EntitlementManager" am: 581afa0bfa am: 407c3afa4a
...
Change-Id: Ib409b85729972e23242551beb39638aaefad0584
2020-05-07 11:26:35 +00:00
Jeongik Cha
8841f71995
Merge "Use stable networkstack-aidl-interfaces" am: 3a22b81ccf am: d12236a66f
...
Change-Id: Ie5671f3b65a314a1b4f8be9917e02da408e00a53
2020-05-07 11:26:19 +00:00
Mark Chien
407c3afa4a
Merge "Refactor the EntitlementManager" am: 581afa0bfa
...
Change-Id: I20f7b03356592cd184b695e4ceb491d4b04cde14
2020-05-07 11:19:16 +00:00
Mark Chien
581afa0bfa
Merge "Refactor the EntitlementManager"
2020-05-07 11:14:40 +00:00
Jeongik Cha
d12236a66f
Merge "Use stable networkstack-aidl-interfaces" am: 3a22b81ccf
...
Change-Id: I278f01d4c8e31913bbc1151bd4733ff8158111d0
2020-05-07 11:12:50 +00:00
Jeongik Cha
3a22b81ccf
Merge "Use stable networkstack-aidl-interfaces"
2020-05-07 10:59:05 +00:00
Jooyung Han
8182d8bd56
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
Change-Id: Ifaecb49a47a1f43edea3ea06e1cf704a177d1044
2020-05-07 17:30:00 +09:00
Mark Chien
044a749f37
Test tethering log dump am: c96fbe0abe
...
Change-Id: If48c35a4dde54b4bdd44703f3df6338267b1b542
2020-05-07 08:19:10 +00:00
Mark Chien
c96fbe0abe
Test tethering log dump
...
Bug: 145490751
Test: atest TetheringTests
Merged-In: I01fc6969041711f7a15880144ee5eac591086ecd
Change-Id: I01fc6969041711f7a15880144ee5eac591086ecd
2020-05-07 06:44:43 +00:00
markchien
dbaff66f45
Override tethering module APK-in-APEX for Go variant
...
Bug: 155604224
Test: build
Change-Id: I4147173b5f3668491ff9cb7f1f86715b036d6d4b
Merged-In: I4147173b5f3668491ff9cb7f1f86715b036d6d4b
2020-05-07 06:35:05 +00:00
markchien
9548c8580c
Override tethering module APK-in-APEX for Go variant
...
Bug: 155604224
Test: build
Change-Id: I4147173b5f3668491ff9cb7f1f86715b036d6d4b
2020-05-07 14:21:49 +08:00
Automerger Merge Worker
6ab2919b02
Merge "Merge "Test tethering log dump" am: 0e3371469e am: 3369043fca" into rvc-dev-plus-aosp am: 3245c39745 am: 13ba213ed0 am: 7a9132ffce
...
Change-Id: I0f402dd1be39f3ed40f2802b0d167358bb08a898
2020-05-07 04:49:14 +00:00
Mark Chien
80aa028b9c
Merge "Test tethering log dump" am: 0e3371469e am: 3369043fca
...
Change-Id: I20e8808afefaf0d5964871db976e288191a75ad7
2020-05-07 03:49:42 +00:00