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
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
2020-03-31 18:29:44 +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
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
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
2020-03-31 10:40:11 -07: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
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
d30aeb02aa
Merge "Import translations. DO NOT MERGE"
2020-03-28 19:12:43 +00:00
TreeHugger Robot
8f0c358ac7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 2a0a236ed0 -s ours am: 4b86077ac3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I415b134179f9a98c2d74e13260480e10fddbbc42
2020-03-28 18:15:30 +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
a81c274f04
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Idaf80948b14cb5a1269f2aaaafec4aa1e500894b
2020-03-28 05:23:44 -07:00
Anton Hansson
84bfee8888
Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a am: 969eb5984d am: 21bd89e6e3 am: 62830a0113
...
Change-Id: If2e366655db585ce3fefae4f752d14740e2aa491
2020-03-27 23:45:25 +00:00
Automerger Merge Worker
5d36cce0e4
Merge "Merge "Feed framework-tethering-stubs the src filegroup" into rvc-dev am: ebb649bf5a am: e9fc36951a am: d0f5e18d9f" into rvc-qpr-dev-plus-aosp am: db84d00f21
...
Change-Id: I750c2364276200ba75ac2661289dcd8e59e74e61
2020-03-27 23:44:57 +00: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
fe728c6ff0
[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: 931b00239c -s ours
...
am skip reason: Change-Id I3941a186770679e7b476073d774e2310e25e44c6 with SHA-1 e31fb9d7bd
2020-03-27 16:54:52 +00:00
Mark Chien
b430cb8e68
[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: ea5e6f0daa -s ours
...
am skip reason: Change-Id I3941a186770679e7b476073d774e2310e25e44c6 with SHA-1 e31fb9d7bd
2020-03-27 16:54:32 +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
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
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
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
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
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
Lorenzo Colitti
0a61e95319
Use CompletableFuture instead of a latch.
...
Addresses review comments on aosp/1260100.
Bug: 150644681
Test: test-only change
Change-Id: Ia73ba8a121a3744a5e36795d2d2bff2f099c1394
2020-03-27 23:51:48 +09:00
Mark Chien
6d4001132d
Register callback and receiver after tethering is created
...
Tethering service is created after boot complete which means most of
the services are ready before tethering. Once tethering register the
callback, callback event may come-in immediately. Make sure all of
tethering related object is created, then register the callback,
receiver, or listener.
Bug: 149965121
Test: atest TetheringTests
manual on/off tethering
Change-Id: Ifdc427341db7d1313ad4b61207a96ab379d100aa
Merged-In: I3941a186770679e7b476073d774e2310e25e44c6
(cherry picked from commit 285be1ee938ddc9728ccc3e951ed0ed1b2fa7117)
2020-03-27 14:01:49 +00:00
Anton Hansson
90ae90b6e0
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
2020-03-27 13:46:11 +00:00
Lorenzo Colitti
ebbb3734d5
Merge "Add an Ethernet tethering test." am: cdd0dabe09 am: 17ce0f6aa1 am: c0380a4e8b am: 72340576f8 am: 599a7eb5c2
...
Change-Id: I2b262fe9b1739e61f2590788a964402f0f5d9311
2020-03-27 11:50:12 +00:00
Lorenzo Colitti
599a7eb5c2
Merge "Add an Ethernet tethering test." am: cdd0dabe09 am: 17ce0f6aa1 am: c0380a4e8b am: 72340576f8
...
Change-Id: Id8e84f5bc059db03b86f335614de5d78c0f568e7
2020-03-27 11:45:23 +00:00
Lorenzo Colitti
72340576f8
Merge "Add an Ethernet tethering test." am: cdd0dabe09 am: 17ce0f6aa1 am: c0380a4e8b
...
Change-Id: Iaff4b980db39644111e8596e864fbe17ccbee359
2020-03-27 11:26:13 +00:00
Lorenzo Colitti
c0380a4e8b
Merge "Add an Ethernet tethering test." am: cdd0dabe09 am: 17ce0f6aa1
...
Change-Id: I027ccf1dd0cca05432994ea08dde55f94d3c2616
2020-03-27 11:07:01 +00:00
Lorenzo Colitti
17ce0f6aa1
Merge "Add an Ethernet tethering test." am: cdd0dabe09
...
Change-Id: Id3ba255901ad7861b10c3d28fc776e74fb642843
2020-03-27 10:51:57 +00:00
Lorenzo Colitti
cdd0dabe09
Merge "Add an Ethernet tethering test."
2020-03-27 10:37:18 +00:00
Mark Chien
148c403637
Merge "Register callback and receiver after tethering is created" am: 33788bcaac am: 01326a25c0 am: bfe7965e6b am: d41831013e am: d0938cd38d
...
Change-Id: Ifdc427341db7d1313ad4b61207a96ab379d100aa
2020-03-27 09:37:01 +00:00
