Treehugger Robot
abb09ea697
Merge "Update Permission only if the network is created" am: 29f0350da3 am: 40ea750175 am: 0109ba492c am: 8dda9eb668
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827912
Change-Id: I705e8e4aee9203a63238ff13d402cb727e7728a7
2021-10-14 07:02:42 +00:00
Treehugger Robot
8dda9eb668
Merge "Update Permission only if the network is created" am: 29f0350da3 am: 40ea750175 am: 0109ba492c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827912
Change-Id: I48d3d37421ec971904f4f1ca029f22abc3e10dcc
2021-10-14 06:46:44 +00:00
Treehugger Robot
0109ba492c
Merge "Update Permission only if the network is created" am: 29f0350da3 am: 40ea750175
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827912
Change-Id: Icf77e2189bd13e4b75363d522a8ac9637760bf15
2021-10-14 06:37:12 +00:00
Treehugger Robot
40ea750175
Merge "Update Permission only if the network is created" am: 29f0350da3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827912
Change-Id: Iaa41edbfe275556c009c00c48dd4a712e6eff3a7
2021-10-14 06:27:02 +00:00
Treehugger Robot
29f0350da3
Merge "Update Permission only if the network is created"
2021-10-14 06:13:54 +00:00
Treehugger Robot
48723f3ced
Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c am: d4c5e13ebe am: bc29f21cfd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056
Change-Id: I33c41bcbb4f5f8641450e8f59a66071a82a689cb
2021-10-13 08:11:44 +00:00
Treehugger Robot
bc29f21cfd
Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c am: d4c5e13ebe
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056
Change-Id: Ied6f3c44b899f23eb9544d2d98b14ce0c1fd2dbf
2021-10-13 07:57:19 +00:00
Treehugger Robot
d4c5e13ebe
Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056
Change-Id: I57bd2a913cc23370ad064054b41cb29c68b80d46
2021-10-13 07:37:44 +00:00
Treehugger Robot
ccb213843c
Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056
Change-Id: Ib8043933f8f3dcd029f0acb601035d96204e2ddd
2021-10-13 07:22:32 +00:00
Treehugger Robot
6b6d2eb75b
Merge "Ignore testRestrictedNetworkPermission on Q"
2021-10-13 07:01:33 +00:00
Xin Li
ab8659cf4f
[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours am: 1fc4fa89ea -s ours am: 67ee516732 -s ours
...
am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1847635
Change-Id: I9c73f7dcd07233f25b26cd47e68352ec18cb6622
2021-10-08 08:30:03 +00:00
Xin Li
67ee516732
[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours am: 1fc4fa89ea -s ours
...
am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1847635
Change-Id: I745ef4d42ecaf06bb81d9dbe0b7162267fea65a8
2021-10-08 07:57:05 +00:00
Xin Li
1fc4fa89ea
[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours
...
am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1847635
Change-Id: I8a28a92726e1dadcecf2b4eef1b7784ca79b1ddf
2021-10-08 01:39:50 +00:00
Xin Li
0d63d026fb
[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours
...
am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1847635
Change-Id: I00bbe32399a8a3952642c1ac1d02f2aeecfa373e
2021-10-08 01:20:24 +00:00
Xin Li
301d6bdfa6
Merge Android 12
...
Bug: 202323961
Merged-In: I3ae21d9b034e455ba48d9576712a102ccda0f647
Change-Id: I0b895d155dfb440a3788cc950a8c76fe8b505dd0
2021-10-06 22:54:04 +00:00
Treehugger Robot
878abac790
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50 am: 039876779e am: 4178cb45dd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I8b78f198353876207a0bf5d1f7c366f9b6d8d7ad
2021-10-06 09:36:51 +00:00
Treehugger Robot
4178cb45dd
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50 am: 039876779e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I32c32b72233d66a7f4510618d33b4d5905a3f552
2021-10-06 09:21:19 +00:00
Treehugger Robot
039876779e
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I595116f9996eca55f60708bfb817577a8b5b624b
2021-10-06 09:10:33 +00:00
Treehugger Robot
6e1c375f50
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I3ae21d9b034e455ba48d9576712a102ccda0f647
2021-10-06 08:52:12 +00:00
Treehugger Robot
f822038c1c
Merge "Support wifi and ethernet connection for DnsResolverTest."
2021-10-06 08:34:52 +00:00
Chalard Jean
dfe07270bd
Merge "Add a small usage comment" am: a898f0a039 am: 7f40360e32 am: 5274a841f1 am: a29760aa9b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844182
Change-Id: I83f09310a81a1bc9dabca70890ea892baa8f3f5c
2021-10-05 11:52:40 +00:00
Chalard Jean
a29760aa9b
Merge "Add a small usage comment" am: a898f0a039 am: 7f40360e32 am: 5274a841f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844182
Change-Id: I67f8526e4b959fc93ee7be5b5f83e55cf5d63c1d
2021-10-05 11:40:40 +00:00
Chalard Jean
5274a841f1
Merge "Add a small usage comment" am: a898f0a039 am: 7f40360e32
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844182
Change-Id: Id953e7f7d5fa0067fc98a0489230c5ab480b7aa8
2021-10-05 11:27:22 +00:00
Chalard Jean
7f40360e32
Merge "Add a small usage comment" am: a898f0a039
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844182
Change-Id: Ibe27d64cd16a2ef44d6a41b94f81a0daa06c523b
2021-10-05 11:14:01 +00:00
Chalard Jean
a898f0a039
Merge "Add a small usage comment"
2021-10-05 10:57:59 +00:00
steven_fann
fa8dbc5da7
Support wifi and ethernet connection for DnsResolverTest.
...
Issue: 199675828
Test: atest CtsNetTestCases:android.net.cts.DnsResolverTest
Change-Id: Ie1c7522426314ccc83008b75f90a57f3a53339d4
2021-10-05 15:36:35 +08:00
Paul Hu
8eadca9700
Merge "Stop using PerUidCounter#transact" am: a7db5ddda5 am: fe5e2742b6 am: 707437622a am: 2541cf6d81
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1821293
Change-Id: I3a3876b7c1e51d3c7d40acb9d985e7fbb4ded1db
2021-10-04 14:35:26 +00:00
Paul Hu
2541cf6d81
Merge "Stop using PerUidCounter#transact" am: a7db5ddda5 am: fe5e2742b6 am: 707437622a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1821293
Change-Id: I30d748c01fa05f05a02ee5ef8bbc721fc32eafae
2021-10-04 14:23:49 +00:00
Paul Hu
707437622a
Merge "Stop using PerUidCounter#transact" am: a7db5ddda5 am: fe5e2742b6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1821293
Change-Id: I854dedc194d11b7042f9e13da7e0a3151b25bdcf
2021-10-04 14:11:12 +00:00
Paul Hu
fe5e2742b6
Merge "Stop using PerUidCounter#transact" am: a7db5ddda5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1821293
Change-Id: Icd1072ef5b8281fa54f71796e7eaa981b0fd943b
2021-10-04 13:58:26 +00:00
Paul Hu
a7db5ddda5
Merge "Stop using PerUidCounter#transact"
2021-10-04 13:48:07 +00:00
Treehugger Robot
343d04c64b
Merge "Increase timeouts for loopers" am: 2ed9b3dc70 am: b370da94ec am: b13c54fd94 am: 1ba78e5f40
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844177
Change-Id: I8d11e13920630c8acd217f2cb24e70733987dd52
2021-10-04 11:32:59 +00:00
Treehugger Robot
1ba78e5f40
Merge "Increase timeouts for loopers" am: 2ed9b3dc70 am: b370da94ec am: b13c54fd94
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844177
Change-Id: If59c8212bea518255d34ffd59cafe8976f30cf41
2021-10-04 11:24:14 +00:00
Treehugger Robot
b13c54fd94
Merge "Increase timeouts for loopers" am: 2ed9b3dc70 am: b370da94ec
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844177
Change-Id: Iaa8fcbb24c252c53c90af85999be6f205979b322
2021-10-04 11:11:12 +00:00
Treehugger Robot
b370da94ec
Merge "Increase timeouts for loopers" am: 2ed9b3dc70
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844177
Change-Id: I8062108d1faf53bf9efbfb947f3238f02b7cf34f
2021-10-04 10:58:27 +00:00
Treehugger Robot
2ed9b3dc70
Merge "Increase timeouts for loopers"
2021-10-04 10:42:59 +00:00
Treehugger Robot
fe9e234a8b
Merge "Add Override anntation for TetheringConnector.setPreferTestNetworks" am: 1503bdc297 am: 1f3515bb48 am: 9e24f96b5a am: 9d6dfd2afe
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844178
Change-Id: I77a50576777fa07e906c7b15680513f00e03e25d
2021-10-04 10:37:08 +00:00
Treehugger Robot
7d841ca67d
Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406 am: 7366c89d64 am: da756e286b am: b4218b8d31
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844176
Change-Id: Ib9e85aebf8a36d761230a1196bc406bc1f701d32
2021-10-04 10:37:00 +00:00
Treehugger Robot
9d6dfd2afe
Merge "Add Override anntation for TetheringConnector.setPreferTestNetworks" am: 1503bdc297 am: 1f3515bb48 am: 9e24f96b5a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844178
Change-Id: Ib5278f0f4cbad01a8ea52b168c5fd971b2648805
2021-10-04 10:23:11 +00:00
Treehugger Robot
b4218b8d31
Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406 am: 7366c89d64 am: da756e286b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844176
Change-Id: I2fe9c251e694fa8493df2287d6c95125f401c17f
2021-10-04 10:22:58 +00:00
Treehugger Robot
9e24f96b5a
Merge "Add Override anntation for TetheringConnector.setPreferTestNetworks" am: 1503bdc297 am: 1f3515bb48
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844178
Change-Id: Iafd4e98db3c3314a92fcbe094826230d2fb5cb48
2021-10-04 10:11:09 +00:00
Treehugger Robot
da756e286b
Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406 am: 7366c89d64
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844176
Change-Id: I54a2b95d21f8655c0268d351a4e27b54a2bce579
2021-10-04 10:11:04 +00:00
Treehugger Robot
1f3515bb48
Merge "Add Override anntation for TetheringConnector.setPreferTestNetworks" am: 1503bdc297
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844178
Change-Id: Ie1f715a7b3ac4d46a25c58e799fb133dfdc55951
2021-10-04 10:00:56 +00:00
Treehugger Robot
7366c89d64
Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844176
Change-Id: I9197503f4f19748824ab3cc1efc8d540779399ec
2021-10-04 10:00:40 +00:00
Treehugger Robot
1503bdc297
Merge "Add Override anntation for TetheringConnector.setPreferTestNetworks"
2021-10-04 09:50:19 +00:00
Treehugger Robot
f697c61406
Merge "Remove "when" usage in ConnectivityServiceTest"
2021-10-04 09:42:47 +00:00
Chalard Jean
025f40bc4f
Add a small usage comment
...
Test: comment-only change
Bug: 201972281
Change-Id: Ifbdadbaacfaf364f6770e56ccb816eb3269003d5
2021-10-04 18:33:36 +09:00
Chalard Jean
1afb2e33e2
Increase timeouts for loopers
...
In coverage tests this seems to randomly fail, which suggests
some delay. Have a constant for timeout and increase its value
significantly where it makes no functional difference.
Test: FrameworksNetTests
Change-Id: I035d865f01688daf3bce30c5130ce550fa84b885
2021-10-04 18:02:17 +09:00
Aaron Huang
e75927b122
Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7 am: 045f47bc31 am: 3820c8b69c am: c502fa51d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117
Change-Id: Ic342b4ecb4541c1e58200112dc5bc092b9ab8f2f
2021-10-04 08:46:40 +00:00
Aaron Huang
c502fa51d4
Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7 am: 045f47bc31 am: 3820c8b69c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117
Change-Id: Ia6bee67074b9ecfe87a3ba11d16b0f7ff3b392c9
2021-10-04 08:32:16 +00:00