Commit Graph

1530 Commits

Author SHA1 Message Date
junyulai
da5dfd9f0d [SP18.3] Adapt TestableNetworkStatsProviderCbBinder
This is a no-op refactoring to adapt new test provider callback.
Also this patch adapts TestLooper to allow better control on
delay messages that will be verified in subsequent tests.

Test: atest OffloadControllerTest
Bug: 149467454
Change-Id: Icfd6ff289d6689ae2d5753d3fe472516c808dc7a
2020-05-04 14:56:36 +08:00
Bill Yi
d47b494eaf [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 43708b4424 -s ours am: 9ab332af75 -s ours am: ba4850fe92 -s ours am: 0d2061355b -s ours
am skip reason: subject contains skip directive

Change-Id: I97e83b3ae4d52538bcd7d51d76ef03c2c6e7adf8
2020-05-02 04:39:22 +00:00
Bill Yi
2d32e90ef7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 43708b4424 -s ours am: 561da8587e -s ours am: 93ec4606af -s ours
am skip reason: subject contains skip directive

Change-Id: I56aeb5ade36d9d3622b121326807b061c2be74ad
2020-05-02 04:27:29 +00:00
Bill Yi
0d2061355b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 43708b4424 -s ours am: 9ab332af75 -s ours am: ba4850fe92 -s ours
am skip reason: subject contains skip directive

Change-Id: I8dd1e1e96d07dc66686bebccff3c57ed95354e78
2020-05-02 04:27:28 +00:00
Bill Yi
0ff1f8a2fe [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 43708b4424 -s ours am: 9ab332af75 -s ours am: 7634016a64 -s ours
am skip reason: subject contains skip directive

Change-Id: I07a82be410ea07558391b5522b00629d6067cf48
2020-05-02 04:27:11 +00:00
Bill Yi
93ec4606af [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 43708b4424 -s ours am: 561da8587e -s ours
am skip reason: subject contains skip directive

Change-Id: I1941f75e4404cbf31de48ce564b7546b44572dec
2020-05-02 04:15:42 +00:00
Bill Yi
7634016a64 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 43708b4424 -s ours am: 9ab332af75 -s ours
am skip reason: subject contains skip directive

Change-Id: If99d702a59473edb2cd78151c6d5c660d9eda6c8
2020-05-02 04:15:24 +00:00
Bill Yi
9ab332af75 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 43708b4424 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib1c6f5bfb858282b4e0392b7d42c0e311409b652
2020-05-02 04:01:53 +00:00
Bill Yi
561da8587e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 43708b4424 -s ours
am skip reason: subject contains skip directive

Change-Id: Idb4fe0283803adcfc785a75e4a683cae3c7ed863
2020-05-02 04:01:53 +00:00
Bill Yi
43708b4424 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-02 03:52:08 +00:00
Anton Hansson
5cfa09e1ac [automerger skipped] Merge "Fix tethering module lib stub default" am: d2ec5841fb am: 6439512cc7 -s ours am: 371f477475 -s ours am: 672e97a607 -s ours
am skip reason: Change-Id Iaab154d9d71900284d92d518a086fc1227c00d5c with SHA-1 dc8e0fc1a1 is in history

Change-Id: Ic4cab3c3fe77b13d970a7216b7e4ef55e0f35150
2020-05-01 10:03:34 +00:00
Anton Hansson
672e97a607 [automerger skipped] Merge "Fix tethering module lib stub default" am: d2ec5841fb am: 6439512cc7 -s ours am: 371f477475 -s ours
am skip reason: Change-Id Iaab154d9d71900284d92d518a086fc1227c00d5c with SHA-1 dc8e0fc1a1 is in history

Change-Id: I00a1d4229dff7ceb56bf1e2469f5ecf0ec5cb34d
2020-05-01 09:47:45 +00:00
Anton Hansson
371f477475 [automerger skipped] Merge "Fix tethering module lib stub default" am: d2ec5841fb am: 6439512cc7 -s ours
am skip reason: Change-Id Iaab154d9d71900284d92d518a086fc1227c00d5c with SHA-1 dc8e0fc1a1 is in history

Change-Id: Ib0fd3dcf5573a3297ddf50bf3b741c486e6f8600
2020-05-01 09:28:43 +00:00
Anton Hansson
6439512cc7 Merge "Fix tethering module lib stub default" am: d2ec5841fb
Change-Id: I11beafef884cb097ac85fab0b8e175d47a76813c
2020-05-01 09:13:22 +00:00
Automerger Merge Worker
2913bfc34f Merge "Merge "Rename module dist files" into rvc-dev am: 7e0949732f am: 5dadd627be am: 3b4a43b00b am: d41f11b0a8" into rvc-qpr-dev-plus-aosp 2020-05-01 09:03:08 +00:00
Anton Hansson
a99e7e6b18 Merge "Rename module dist files" into rvc-dev am: 7e0949732f am: 5dadd627be am: 3b4a43b00b am: d41f11b0a8
Change-Id: I5b33c0d988f4d6c2d5dc91b6034edf73fcdbb72b
2020-05-01 09:03:01 +00:00
Automerger Merge Worker
9e1651cb06 Merge "Merge "Rename module dist files" into rvc-dev am: 7e0949732f am: b84b93b629" into rvc-d1-dev-plus-aosp am: 092feba072
Change-Id: I8c4d7b0277f0ddca225d9f1b856f1d388d6a5ce1
2020-05-01 09:02:50 +00:00
Anton Hansson
5413c99cc5 Merge "Rename module dist files" into rvc-dev am: 7e0949732f am: 5dadd627be am: 52ba1b7f85
Change-Id: I3e5e4a0bf440ba8d659f3ed46d4f39341d794c0a
2020-05-01 09:02:25 +00:00
Anton Hansson
d2ec5841fb Merge "Fix tethering module lib stub default" 2020-05-01 08:58:26 +00:00
Anton Hansson
d41f11b0a8 Merge "Rename module dist files" into rvc-dev am: 7e0949732f am: 5dadd627be am: 3b4a43b00b
Change-Id: Ibd21cdba2e0403ecc8afce9cf86e3bfaef8ded21
2020-05-01 08:55:00 +00:00
Automerger Merge Worker
092feba072 Merge "Merge "Rename module dist files" into rvc-dev am: 7e0949732f am: b84b93b629" into rvc-d1-dev-plus-aosp 2020-05-01 08:48:57 +00:00
Anton Hansson
de38744bdc Merge "Rename module dist files" into rvc-dev am: 7e0949732f am: b84b93b629
Change-Id: Id8b79462753652668fb7e1c91a69e9f1924812a8
2020-05-01 08:48:48 +00:00
Anton Hansson
52ba1b7f85 Merge "Rename module dist files" into rvc-dev am: 7e0949732f am: 5dadd627be
Change-Id: I26692b3902bd9dfe97196acd11bd6ddb73b8f16e
2020-05-01 08:48:42 +00:00
Anton Hansson
b84b93b629 Merge "Rename module dist files" into rvc-dev am: 7e0949732f
Change-Id: If24bfcc6dbe243d61863a5561b01f44bdadb439e
2020-05-01 08:38:54 +00:00
Anton Hansson
5dadd627be Merge "Rename module dist files" into rvc-dev am: 7e0949732f
Change-Id: I1b9fa1a580c7340df475cb150fe0373a7191869c
2020-05-01 08:38:34 +00:00
TreeHugger Robot
6c2fce2ef2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 917b3869fe -s ours
am skip reason: subject contains skip directive

Change-Id: I1e5d242296c0c35daea9e7d0a220eb40e4051bdd
2020-05-01 05:42:47 +00:00
TreeHugger Robot
917b3869fe Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-05-01 05:32:11 +00:00
Bill Yi
b4c3fee27f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ib973f0e381ec0c90f5983a266341444cf919bbea
2020-04-30 19:01:25 -07:00
Treehugger Robot
d9b2a2acec [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5f2cebc10a -s ours am: b518fd475c -s ours am: 463f6ab492 -s ours am: 4f926f4a35 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibe80c4afe0231b0c21ceafdfc6806bd9a0afcd0d
2020-05-01 00:51:48 +00:00
Treehugger Robot
4f926f4a35 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5f2cebc10a -s ours am: b518fd475c -s ours am: 463f6ab492 -s ours
am skip reason: subject contains skip directive

Change-Id: Icdecc59726e3b1cd5d33cffd7315525fc8bad13e
2020-05-01 00:28:22 +00:00
Treehugger Robot
463f6ab492 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5f2cebc10a -s ours am: b518fd475c -s ours
am skip reason: subject contains skip directive

Change-Id: I46c4106b8158aecf93b9a1a36b170409f510d534
2020-05-01 00:24:19 +00:00
Bill Yi
e54f45286a Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ifcec6b94f4da00c387216f50e5e9530cdb8f598d
2020-04-30 17:16:36 -07:00
Treehugger Robot
b518fd475c [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5f2cebc10a -s ours
am skip reason: subject contains skip directive

Change-Id: Iec96a2a81d4ad75c01c22bf1ff7b73991816155e
2020-05-01 00:10:04 +00:00
Bill Yi
3b1e3d04f6 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I3b69996ab87b3c9ddeeb5c6166a1256b77f30c12
2020-04-30 15:32:29 -07:00
Anton Hansson
26fa9fd192 Merge "Fix tethering module lib stub default" into rvc-dev am: f4fe711313 am: 03a93bff6d am: b746bd2046 am: 8369bddd00
Change-Id: I595f4afa4cc8486f454c21ccbada0e5d59711371
2020-04-30 20:39:34 +00:00
Anton Hansson
92d37305d0 Merge "Fix tethering module lib stub default" into rvc-dev am: f4fe711313 am: 261d6735ce am: d18a675594
Change-Id: I28b1620fa4a981ffb7aba8645c334bb1b4aa297e
2020-04-30 20:22:13 +00:00
Anton Hansson
7439d68b74 Merge "Fix tethering module lib stub default" into rvc-dev am: f4fe711313 am: 03a93bff6d am: 605b8564b7
Change-Id: I4c94cc88919af5f3318ebf28f4c3134320c9ccd3
2020-04-30 20:21:05 +00:00
Anton Hansson
8369bddd00 Merge "Fix tethering module lib stub default" into rvc-dev am: f4fe711313 am: 03a93bff6d am: b746bd2046
Change-Id: Ib75f8287ab88071b2bf2a0dcafa04b89e05424a8
2020-04-30 20:20:16 +00:00
Anton Hansson
d18a675594 Merge "Fix tethering module lib stub default" into rvc-dev am: f4fe711313 am: 261d6735ce
Change-Id: I5348fa8c83f07a8e0195770e2dd3e57c64e8b633
2020-04-30 20:10:24 +00:00
Anton Hansson
605b8564b7 Merge "Fix tethering module lib stub default" into rvc-dev am: f4fe711313 am: 03a93bff6d
Change-Id: I0c9a7df0d9c5fd060f27316a12f74c228d797c93
2020-04-30 20:07:58 +00:00
Anton Hansson
bb5231decc Rename module dist files
This makes the filenames of the disted artifacts (api txts and stubs)
match the module name of the modules they're from. This matches the
naming scheme used by java_sdk_library, which should make the future
transition to this build rule easier.

Bug: 149293194
Test: lunch sdk_phone_armv7 && m sdk dist && find out/dist/apistubs
Change-Id: I076f30931bf2524d57703873cd7de25b3f23b457
Merged-In: I076f30931bf2524d57703873cd7de25b3f23b457
(cherry picked from commit d7f1fabc94)
2020-04-30 20:56:11 +01:00
Anton Hansson
03a93bff6d Merge "Fix tethering module lib stub default" into rvc-dev am: f4fe711313
Change-Id: I1d30f0a8603f6d8009e9fea146de5f9481532147
2020-04-30 19:53:34 +00:00
Anton Hansson
261d6735ce Merge "Fix tethering module lib stub default" into rvc-dev am: f4fe711313
Change-Id: I9366346c2e9735b3dcbe0e54fa886e65d86106c0
2020-04-30 19:53:17 +00:00
Anton Hansson
d7f1fabc94 Rename module dist files
This makes the filenames of the disted artifacts (api txts and stubs)
match the module name of the modules they're from. This matches the
naming scheme used by java_sdk_library, which should make the future
transition to this build rule easier.

Bug: 149293194
Test: lunch sdk_phone_armv7 && m sdk dist && find out/dist/apistubs
Change-Id: I076f30931bf2524d57703873cd7de25b3f23b457
2020-04-30 17:42:20 +01:00
Anton Hansson
a8f2e3ead5 Fix tethering module lib stub default
It was using the systemapi stub defaults, but should be using the
module_lib default.

Bug: 144149403
Test: m
Change-Id: Iaab154d9d71900284d92d518a086fc1227c00d5c
Merged-In: Iaab154d9d71900284d92d518a086fc1227c00d5c
(cherry picked from commit dc8e0fc1a1)
2020-04-30 17:05:01 +01:00
Anton Hansson
dc8e0fc1a1 Fix tethering module lib stub default
It was using the systemapi stub defaults, but should be using the
module_lib default.

Bug: 144149403
Test: m
Change-Id: Iaab154d9d71900284d92d518a086fc1227c00d5c
2020-04-30 17:02:07 +01:00
Junyu Lai
3a985ea91f [automerger skipped] Merge changes I38628dad,I2467b647 into rvc-dev am: 027c80d2d6 am: 50815fdafe am: ea959b046a am: b0c6b797ab -s ours
am skip reason: Change-Id I38628daddcb7be7c74846e78d36dc88f065b97d9 with SHA-1 40092b1fa7 is in history

Change-Id: Id47978a13ba61df23e68a0f2cd0668fc5157674d
2020-04-30 07:12:44 +00:00
Junyu Lai
2fc4fbe2ae [automerger skipped] [SP18] Poll network stats in OffloadController to support data warning am: bf6fa99b2a am: f776651a4b am: 8cf78dbfb8 am: eee4bdb603 -s ours
am skip reason: Change-Id I2467b64779b74cd5fec73b42fb303584f52cb1cb with SHA-1 bf6fa99b2a is in history

Change-Id: I1e6dec477176280598694623a84c9f169075e586
2020-04-30 07:12:36 +00:00
Remi NGUYEN VAN
8927e31667 [automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 675ec9d30e am: d24ff42f00 am: da2ec9bddd am: 8ae7444003 -s ours
am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 a530ebb62d is in history

Change-Id: Ia15ec8daf44b8feb0d7559813b5f1c78e890214e
2020-04-30 07:11:36 +00:00
Junyu Lai
78799f9ba2 [automerger skipped] Merge changes I38628dad,I2467b647 into rvc-dev am: 027c80d2d6 -s ours am: 1a16968c3b -s ours am: 795f9abaab -s ours
am skip reason: Change-Id I38628daddcb7be7c74846e78d36dc88f065b97d9 with SHA-1 40092b1fa7 is in history

Change-Id: Icbe47e3f2ff228e0327de17f76266c754b9e71a4
2020-04-30 07:01:58 +00:00