Commit Graph

1530 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Treehugger Robot
d93de672d1 Merge "Assign specific client address to dhcp server" am: 037becbf64 am: 815ab636c3 am: a3fbca5f60
Change-Id: I104a19580179abda5bdeb5086a269b50b7fb074b
2020-03-31 17:47:25 +00:00
Remi NGUYEN VAN
3ec724b979 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: b3289466c5 am: 2692eab096 -s ours am: f3d6eb3da9 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 db3d568139 is in history

Change-Id: I5b57ee16e81765981fb4154aa27c1be4ecb85d02
2020-03-31 17:44:07 +00:00
Android Build Merger (Role)
cbe03df318 Merge "Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7 am: 9cc9f6b471 am: f27f2ae4bb" into rvc-d1-dev-plus-aosp am: 1b64249120
Change-Id: Ibcad3cee0cb55370ae7ad05f864110029f8fb4d0
2020-03-31 17:43:30 +00:00
Lorenzo Colitti
76052fca77 Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7 am: 9cc9f6b471
am: f27f2ae4bb

Change-Id: I5e1a437c17857e9d4147df5e4459bca0d543fc3a
2020-03-31 10:40:11 -07:00
Anton Hansson
c866875727 [automerger skipped] Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae am: edd558b244 -s ours
am skip reason: Change-Id I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190 with SHA-1 90ae90b6e0 is in history

Change-Id: If0728ff3de015e338161f538dc3aea83808952ba
2020-03-31 12:12:23 +00:00
Anton Hansson
edd558b244 Merge "Feed framework-tethering-stubs the src filegroup" am: f7a2a2d4ae
Change-Id: Ib9e7dd7756dd4b6cf3f72c009a26075b3132e6be
2020-03-31 11:55:37 +00:00
Anton Hansson
f7a2a2d4ae Merge "Feed framework-tethering-stubs the src filegroup" 2020-03-31 11:39:40 +00:00
paulhu
4175676eab Fix EntitlementManager issues
1. Add TETHERING_ETHERNET to vaild downstream type. So starting
   ethernet tethering will do entitlement check as well.
2. Ignore request with invalid downstream type on
   handleRequestLatestTetheringEntitlementValue()

Bug: 152828758
Bug: 152828142
Test: atests TetheringTests CtsTetheringTest

Change-Id: Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8
2020-03-31 18:01:54 +08:00
Anton Hansson
cdc8658403 Feed framework-tethering-stubs the src filegroup
This filegroups strips the "src" prefix away from the src path
for the filter_packages check in droiddoc.

Bug: 149293194
Test: m update-api (no change)
Change-Id: I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190
Merged-In: I5b9ffa211be9c1a7dd8f63d5e7ba2a825d0d3190
2020-03-31 09:56:55 +01:00
Anton Hansson
dae9d36d40 [automerger skipped] Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50 am: 1de34ce81b -s ours
am skip reason: Change-Id I330133824e78b3a8927e3d3ffbbd729bcdcb8822 with SHA-1 7939cb0a4a is in history

Change-Id: Ib1172487afd1fdfea82b83099ebfc60101afc6c0
2020-03-30 15:10:56 +00:00
Anton Hansson
82b68376aa [automerger skipped] Merge "Build tethering against the module SDK" am: 6abf8e41f7 am: fdcab3c71c -s ours
am skip reason: Change-Id I7c93b60654e21a4a27d21cbf0c2a6cb21f813529 with SHA-1 aaeaa195b8 is in history

Change-Id: I1f1e4179236397649989ed7bff24d99ed5bada6b
2020-03-30 15:10:31 +00:00
Anton Hansson
1de34ce81b Merge "Make framework-tethering stubs use the new defaults" am: fb38e85a50
Change-Id: I148fcec861b97fbead0884918bff4e1560fab23d
2020-03-30 14:47:33 +00:00
Anton Hansson
fdcab3c71c Merge "Build tethering against the module SDK" am: 6abf8e41f7
Change-Id: If720371eac2acc92677a15f7c0c5ae55c84023a6
2020-03-30 14:47:06 +00:00
Anton Hansson
fb38e85a50 Merge "Make framework-tethering stubs use the new defaults" 2020-03-30 14:16:02 +00:00
Anton Hansson
6abf8e41f7 Merge "Build tethering against the module SDK" 2020-03-30 14:15:42 +00:00
Treehugger Robot
a3fbca5f60 Merge "Assign specific client address to dhcp server" am: 037becbf64 am: 815ab636c3
Change-Id: Ia0e4a913faa5eac5d5ccba837eb7774d59670d27
2020-03-30 04:23:55 +00:00
Treehugger Robot
815ab636c3 Merge "Assign specific client address to dhcp server" am: 037becbf64
Change-Id: Ic5b645bb62a1b62ab010a9fa50427e1a1fc8ff01
2020-03-30 04:06:29 +00:00
Remi NGUYEN VAN
f3d6eb3da9 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: b3289466c5 am: 2692eab096 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 db3d568139 is in history

Change-Id: Id4a9f21ae303960d29835443517cc7ae7c87f470
2020-03-30 03:40:28 +00:00
Lorenzo Colitti
f27f2ae4bb Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7 am: 9cc9f6b471
Change-Id: I1967dcb1a51cedb110a47ed5ad14e4e71f95adf3
2020-03-30 03:38:51 +00:00
Treehugger Robot
037becbf64 Merge "Assign specific client address to dhcp server" 2020-03-30 03:38:46 +00:00
Remi NGUYEN VAN
2692eab096 Merge "Create a builder for NetworkCapabilities." am: b3289466c5
Change-Id: I2c78de7b501edca618441040fbe76e34ce15b08e
2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
b3289466c5 Merge "Create a builder for NetworkCapabilities." 2020-03-30 02:58:45 +00:00
Lorenzo Colitti
9cc9f6b471 Merge "Use CompletableFuture instead of a latch." am: a5f8e9b3d7
Change-Id: Ia6595e18ac62862f8458efb0fc4523f64795d9ca
2020-03-30 02:50:18 +00:00
TreeHugger Robot
4b86077ac3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 2a0a236ed0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib1672eff3412a595a8821f71af247a774238a372
2020-03-28 18:09:28 +00:00
TreeHugger Robot
2a0a236ed0 Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-03-28 18:08:07 +00:00
Bill Yi
49ea07f087 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I4bedd02ee1c673d604782844f69ee2803f61729c
2020-03-28 07:21:37 -07:00
Bill Yi
f0d478295c Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ie2f4603cc037a2f1ddfebf51d7639aa4e9d122f5
2020-03-28 03:25:23 -07:00
Anton Hansson
62830a0113 Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a am: 969eb5984d am: 21bd89e6e3
Change-Id: I2d5ed7a392d1bb4516f5cfce413648a662416e28
2020-03-27 23:29:14 +00:00
Anton Hansson
daceebdabe Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a am: e9fc36951a am: d0f5e18d9f
Change-Id: Ia7a9ae99d96347680c3ad94427f18f0086569489
2020-03-27 23:28:58 +00:00
Anton Hansson
21bd89e6e3 Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a am: 969eb5984d
Change-Id: I2e1c1ea72284b87559403e08cae81f96a0eb7c41
2020-03-27 23:16:15 +00:00
Anton Hansson
969eb5984d Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a
Change-Id: I2719c6447a151afdba27af18027273a3221bd40b
2020-03-27 23:10:03 +00:00
Anton Hansson
d0f5e18d9f Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a am: e9fc36951a
Change-Id: I4abcb4f3eef5e5cf2c0499e1200f60f6480c6f53
2020-03-27 23:09:46 +00:00
Anton Hansson
e9fc36951a Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a
Change-Id: Ic124bdca285f0e952ed65214eaa3cc0778a142d4
2020-03-27 23:08:37 +00:00
Anton Hansson
ebb649bf5a Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev 2020-03-27 23:05:45 +00:00
Mark Chien
931b00239c [automerger skipped] Merge "Register callback and receiver after tethering is created" into rvc-dev am: 60388d2bfe -s ours am: 210e839e29 -s ours am: 3a1d9b209b -s ours
am skip reason: Change-Id I3941a186770679e7b476073d774e2310e25e44c6 with SHA-1 e31fb9d7bd is in history

Change-Id: I0c861eb41f2a45eeba41c0039b0cc53b3e3efb77
2020-03-27 16:40:51 +00:00
Mark Chien
ea5e6f0daa [automerger skipped] Merge "Register callback and receiver after tethering is created" into rvc-dev am: 60388d2bfe am: 30f73bae19 -s ours am: d5a8161c92 -s ours
am skip reason: Change-Id I3941a186770679e7b476073d774e2310e25e44c6 with SHA-1 e31fb9d7bd is in history

Change-Id: I24a9fdb37001a691512ef667c070b57098520edb
2020-03-27 16:40:38 +00:00
Mark Chien
3a1d9b209b [automerger skipped] Merge "Register callback and receiver after tethering is created" into rvc-dev am: 60388d2bfe -s ours am: 210e839e29 -s ours
am skip reason: Change-Id I3941a186770679e7b476073d774e2310e25e44c6 with SHA-1 e31fb9d7bd is in history

Change-Id: Ibca48eff46d8ca9bc4168e484366b8aa0b3969ae
2020-03-27 16:21:50 +00:00
Mark Chien
d5a8161c92 [automerger skipped] Merge "Register callback and receiver after tethering is created" into rvc-dev am: 60388d2bfe am: 30f73bae19 -s ours
am skip reason: Change-Id I3941a186770679e7b476073d774e2310e25e44c6 with SHA-1 e31fb9d7bd is in history

Change-Id: I6dc4bb011e784171acc52b880e36d31fc1e2043f
2020-03-27 16:21:24 +00:00
Mark Chien
210e839e29 [automerger skipped] Merge "Register callback and receiver after tethering is created" into rvc-dev am: 60388d2bfe -s ours
am skip reason: Change-Id I3941a186770679e7b476073d774e2310e25e44c6 with SHA-1 e31fb9d7bd is in history

Change-Id: Ibafc5531c4073fe2d9ace03bb14c2c045ff204c9
2020-03-27 16:17:21 +00:00
Mark Chien
30f73bae19 Merge "Register callback and receiver after tethering is created" into rvc-dev am: 60388d2bfe
Change-Id: I311e5db2aacde60b4eb3cb893a9234e9501e5f36
2020-03-27 16:13:10 +00:00