Commit Graph

942 Commits

Author SHA1 Message Date
Paul Hu
0c149ed3e6 Merge "Fix EntitlementManager issues" am: 943af02d92 am: 7f05bb9b2d am: 784b7a6925 am: fbc0efb4f1 am: 7975177e5f
Change-Id: Ia353f570bc9706b1d1ae1eeb3684cf64a686ff15
2020-04-06 08:52:54 +00:00
Paul Hu
7975177e5f Merge "Fix EntitlementManager issues" am: 943af02d92 am: 7f05bb9b2d am: 784b7a6925 am: fbc0efb4f1
Change-Id: I7c8e1fb6597c2a2de4cc93d1ead458b56082e02f
2020-04-06 08:52:15 +00:00
Paul Hu
fbc0efb4f1 Merge "Fix EntitlementManager issues" am: 943af02d92 am: 7f05bb9b2d am: 784b7a6925
Change-Id: I21c106b58c72959e695b4249f780f61eacf00a83
2020-04-06 08:34:41 +00:00
Paul Hu
784b7a6925 Merge "Fix EntitlementManager issues" am: 943af02d92 am: 7f05bb9b2d
Change-Id: I0fef76b2fa00757afc1db9a073ad9e912ca98b19
2020-04-06 08:33:31 +00:00
Paul Hu
7f05bb9b2d Merge "Fix EntitlementManager issues" am: 943af02d92
Change-Id: I557ef0b3278aa72e34a2290c49dc3c8b82bceaf9
2020-04-06 07:56:26 +00:00
Paul Hu
943af02d92 Merge "Fix EntitlementManager issues" 2020-04-06 07:33:26 +00:00
Jooyung Han
13c32c9709 Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: 39d545982e am: c3c4e49702 am: a4686e8086 am: c35017d45f
Change-Id: Ibeb96dfd5e1a09cae35ca43d2286d0acf94f47fc
2020-04-05 01:50:35 +00:00
Jooyung Han
c35017d45f Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: 39d545982e am: c3c4e49702 am: a4686e8086
Change-Id: I66f42399f2545d271bf8bd81e851f4fcd0d7a68e
2020-04-05 01:42:20 +00:00
Jooyung Han
b22506e11b Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: ae70a497c5 am: 4287e0008d am: 2d2c948a52
Change-Id: I5cd3277d0a2f836b108b6c7a783f4045db939900
2020-04-05 01:42:08 +00:00
Jooyung Han
29558d9ac7 Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: 39d545982e am: 3c6dfcf00d am: ff15621dd9
Change-Id: Id5c8a671a2053f706dd8c149799b959fb3e3d388
2020-04-05 01:41:26 +00:00
Jooyung Han
2d2c948a52 Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: ae70a497c5 am: 4287e0008d
Change-Id: I84afd5935a1f507b14a7eb316d56e5e76f0acfe2
2020-04-05 01:20:41 +00:00
Jooyung Han
a4686e8086 Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: 39d545982e am: c3c4e49702
Change-Id: I6875a6832a84ab19fc805589c8552cf91a8cd0b7
2020-04-05 01:20:13 +00:00
Jooyung Han
ff15621dd9 Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: 39d545982e am: 3c6dfcf00d
Change-Id: Ife4b7e1bb4797eccc385cc58ca60103af71fc92f
2020-04-05 01:20:11 +00:00
Jooyung Han
4287e0008d Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: ae70a497c5
Change-Id: I2e8ad8488cb439bdc1024770f94743af470f7dfd
2020-04-05 01:03:23 +00:00
Jooyung Han
3c6dfcf00d Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c am: 39d545982e
Change-Id: I1d48c1fd48d6c0771ee73e8dcf216e52524319b4
2020-04-05 01:02:18 +00:00
Jooyung Han
ae70a497c5 Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c
Change-Id: I3d029c8aa9fd4fdea6589cb5d69e94803b9a78c6
2020-04-05 00:32:30 +00:00
Jooyung Han
39d545982e Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c
Change-Id: I531247560c84d3cc49459d340f6c2d6cf6b31141
2020-04-05 00:32:14 +00:00
Lorenzo Colitti
be230bf9f7 Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e am: b3c0b9205f am: d233c3c1db am: 24a3188dd7 am: 674256af64
Change-Id: I5375da5a15dfd050754beb1573c69c89983a2aa8
2020-04-03 09:44:27 +00:00
Lorenzo Colitti
674256af64 Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e am: b3c0b9205f am: d233c3c1db am: 24a3188dd7
Change-Id: I20eac5fd1c367e7ddbee05065b6b728a27cfb11c
2020-04-03 09:24:12 +00:00
Lorenzo Colitti
24a3188dd7 Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e am: b3c0b9205f am: d233c3c1db
Change-Id: I3ca6865c2fad4dfaef44f44fe38c32e863245492
2020-04-03 09:04:48 +00:00
Lorenzo Colitti
d233c3c1db Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e am: b3c0b9205f
Change-Id: I211d8e6a19d56d79afe3ad894b8398f4c36d0e9f
2020-04-03 08:41:51 +00:00
Lorenzo Colitti
b3c0b9205f Merge "Add a test for static IPv4 address tethering configuration." am: 9a920cb92e
Change-Id: I592468bf53ff925ec4ee8a04fee20404594237fe
2020-04-03 08:31:39 +00:00
Lorenzo Colitti
cfd82d4361 Add a test for static IPv4 address tethering configuration.
Bug: 150644681
Test: test-only change
Change-Id: I8f4a99da2351fdb5467f561a9732b14a8ebf674b
2020-04-03 10:47:47 +09:00
Jooyung Han
f1460fad52 Add min_sdk_version:R to updatable apexes
APEXes introduced in R need to set min_sdk_version to ensure that they
are built against correct version(30 or R) of stubs (libc/liblog/...).

Bug: 152655956
Test: /vendor/google/build/build_mainline_modules.sh
Change-Id: I4a893c34b09334eea124266287301e479b9e8a59
2020-04-02 13:54:06 +00:00
Lorenzo Colitti
a6ef7c765c [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 am: b326d28ff9 am: 538a5e145e am: 9f1af1dbc1 -s ours am: a1d00c325e -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 eb73310727 is in history

Change-Id: I1fcaa72f91dbea3c493404ff4f41c9a8fa333207
2020-04-01 04:48:39 +00:00
Lorenzo Colitti
ba78232c63 [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 -s ours am: 8a30564015 -s ours am: 5b6c34808a -s ours am: 6cf628080b -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 eb73310727 is in history

Change-Id: Id4b84c35690f241bb11a658d72ae2f7d4a701568
2020-04-01 04:48:07 +00:00
Lorenzo Colitti
4163caf286 [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 am: b326d28ff9 -s ours am: 6330aa851c -s ours am: a23576d00b -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 4896e3200f is in history

Change-Id: Ia0c3528af94ad12e9b9ab4daf54a712e4cff2646
2020-04-01 04:47:20 +00:00
Lorenzo Colitti
a1d00c325e [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 am: b326d28ff9 am: 538a5e145e am: 9f1af1dbc1 -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 eb73310727 is in history

Change-Id: I8bbd099d0495ad315f46a16e07e12c1fd33460f9
2020-04-01 04:47:01 +00:00
Lorenzo Colitti
9f1af1dbc1 Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 am: b326d28ff9 am: 538a5e145e
Change-Id: Iea225dfd81eb2b146a679b1f40999c86fbb3fe9a
2020-04-01 04:34:30 +00:00
Lorenzo Colitti
6cf628080b [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 -s ours am: 8a30564015 -s ours am: 5b6c34808a -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 eb73310727 is in history

Change-Id: I92f1485eac9fe9f5e25c66477191345bea115e33
2020-04-01 04:34:30 +00:00
Lorenzo Colitti
a23576d00b [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 am: b326d28ff9 -s ours am: 6330aa851c -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 4896e3200f is in history

Change-Id: I7a3c2adca426893e62e215f5ecbace67f0ccdfea
2020-04-01 04:34:05 +00:00
Lorenzo Colitti
5b6c34808a [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 -s ours am: 8a30564015 -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 4896e3200f is in history

Change-Id: Ia4e445ae925e3767787bad2551ed8dff53aef3eb
2020-04-01 04:21:55 +00:00
Lorenzo Colitti
6330aa851c [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 am: b326d28ff9 -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 4896e3200f is in history

Change-Id: I3d6df9dafa804f97171a820547c2713f518006ca
2020-04-01 04:21:39 +00:00
Lorenzo Colitti
b326d28ff9 Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0
Change-Id: I6be7379914fcaade0177d661d5e80ba5031b50d7
2020-04-01 04:08:00 +00:00
Lorenzo Colitti
8a30564015 [automerger skipped] Merge "Add an Ethernet tethering test." into rvc-dev am: 57827f67e0 -s ours
am skip reason: Change-Id Ifcda70b73848b1fd4c26b031e53f0a6500cc93d4 with SHA-1 4896e3200f is in history

Change-Id: Ib24fee25c1aedfe1a18d039141be032b4503c9f0
2020-04-01 04:07:46 +00:00
Lorenzo Colitti
57827f67e0 Merge "Add an Ethernet tethering test." into rvc-dev 2020-04-01 03:56:28 +00:00
Anton Hansson
f1f7462836 [automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae am: edd558b244 -s ours am: c866875727 -s ours am: cafb176e27 -s ours am: 0af5bd283a -s ours
am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 90ae90b6e0 is in history

Change-Id: I5a62ffc6aa9e84fbc70a8620c7e359c7749622e6
2020-03-31 21:25:37 +00:00
Anton Hansson
0af5bd283a [automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae am: edd558b244 -s ours am: c866875727 -s ours am: cafb176e27 -s ours
am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 90ae90b6e0 is in history

Change-Id: I5e2b591a9cad882c8b00b4cf7e7a17674a53b838
2020-03-31 20:27:29 +00:00
Anton Hansson
fb693d41aa [automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50 am: 1de34ce81b -s ours am: dae9d36d40 -s ours am: e3a0261d66 -s ours am: b89e093149 -s ours
am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 7939cb0a4a is in history

Change-Id: Ic2d7ef5a320f76a9e0da79783d96cab9a1b49e8d
2020-03-31 19:15:46 +00:00
Anton Hansson
52958e021c [automerger skipped] Merge "Build tethering against the module SDK" am: 6abf8e41f7 am: fdcab3c71c -s ours am: 82b68376aa -s ours am: 4712f7a266 -s ours am: f7927f781e -s ours
am skip reason: Change-Id I7c93b60654e21a4a27d21cbf0c2a6cb21f813529 with SHA-1 aaeaa195b8 is in history

Change-Id: I1fa3d3f9986ba1a8bd45d5002b65acee27b6c0f9
2020-03-31 19:14:59 +00:00
Anton Hansson
cafb176e27 [automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae am: edd558b244 -s ours am: c866875727 -s ours
am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 90ae90b6e0 is in history

Change-Id: I64f33c660d24075e5eca1aa075b04a6655dc5053
2020-03-31 19:14:51 +00:00
Treehugger Robot
196a5ff482 Merge "Assign specific client address to dhcp server" am: 037becbf64 am: 815ab636c3 am: a3fbca5f60 am: d93de672d1 am: 7f34b15526
Change-Id: I0d0ae21e4784f7320d7785763ed0a1079e2271e4
2020-03-31 18:37:00 +00:00
Anton Hansson
b89e093149 [automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50 am: 1de34ce81b -s ours am: dae9d36d40 -s ours am: e3a0261d66 -s ours
am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 7939cb0a4a is in history

Change-Id: I08e121ca4442cdd08a05b94147e5d89396cff06f
2020-03-31 18:30:28 +00:00
Remi NGUYEN VAN
5c63bd004b [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: b3289466c5 am: 2692eab096 -s ours am: f3d6eb3da9 -s ours am: 3ec724b979 -s ours am: eb7fbdd42c -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 db3d568139 is in history

Change-Id: Iec9c771adfcec5dcc5c95d701d69ab338e83b16f
2020-03-31 18:29:44 +00:00
Anton Hansson
f7927f781e [automerger skipped] Merge "Build tethering against the module SDK" am: 6abf8e41f7 am: fdcab3c71c -s ours am: 82b68376aa -s ours am: 4712f7a266 -s ours
am skip reason: Change-Id I7c93b60654e21a4a27d21cbf0c2a6cb21f813529 with SHA-1 aaeaa195b8 is in history

Change-Id: If20d733e14df608a6fa0869ca6b3eb15bc26fea2
2020-03-31 18:29:22 +00:00
Anton Hansson
e3a0261d66 [automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50 am: 1de34ce81b -s ours am: dae9d36d40 -s ours
am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 7939cb0a4a is in history

Change-Id: Ie16de83afa55c813acb191b3b77252eb60db7bd4
2020-03-31 18:09:19 +00:00
Anton Hansson
4712f7a266 [automerger skipped] Merge "Build tethering against the module SDK" am: 6abf8e41f7 am: fdcab3c71c -s ours am: 82b68376aa -s ours
am skip reason: Change-Id I7c93b60654e21a4a27d21cbf0c2a6cb21f813529 with SHA-1 aaeaa195b8 is in history

Change-Id: Ib7290fef2146de35335dfbab67bde94011f8cd4f
2020-03-31 18:09:03 +00:00
Android Build Merger (Role)
63aa6173b0 Merge "Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7 am: 9cc9f6b471 am: f27f2ae4bb" into rvc-d1-dev-plus-aosp am: 1b64249120 am: cbe03df318
Change-Id: If93377b5832751d3d3a20f0af66bffeaecb3187b
2020-03-31 18:07:47 +00:00
Treehugger Robot
7f34b15526 Merge "Assign specific client address to dhcp server" am: 037becbf64 am: 815ab636c3 am: a3fbca5f60 am: d93de672d1
Change-Id: I324de55833b2426502ada2ac36cdfda0a022e84e
2020-03-31 18:01:33 +00:00
Remi NGUYEN VAN
eb7fbdd42c [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: b3289466c5 am: 2692eab096 -s ours am: f3d6eb3da9 -s ours am: 3ec724b979 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 db3d568139 is in history

Change-Id: I8f96e4066e1a78b7f60e3488ac73669a2c9bfb6e
2020-03-31 18:00:26 +00:00