Cody Kesting
dd6c474ec0
Merge "Fix ConnDiags Test for invoke-after-validate and unregister CBs." into rvc-dev am: ba9dd48cca am: 0660737884 am: 3e127b8fc1 am: 5812b032d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916181
Change-Id: If75f768952b68ed726cc97289467e2a30cff94fe
2020-06-22 19:03:37 +00:00
Cody Kesting
5812b032d5
Merge "Fix ConnDiags Test for invoke-after-validate and unregister CBs." into rvc-dev am: ba9dd48cca am: 0660737884 am: 3e127b8fc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916181
Change-Id: I1571aac1d84281e9598aed7dcf489c14d3e886b6
2020-06-22 18:50:25 +00:00
Cody Kesting
0660737884
Merge "Fix ConnDiags Test for invoke-after-validate and unregister CBs." into rvc-dev am: ba9dd48cca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916181
Change-Id: If04cf6649804b35f10012339f032e5f2d34f894a
2020-06-22 18:27:32 +00:00
Automerger Merge Worker
3d18f98169
Merge "[automerger skipped] Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev am: efaf28e9f3 am: 254f9bb9ad -s ours" into rvc-d1-dev-plus-aosp am: 603c2a666f -s ours am: 6d3fb92c85 -s ours
...
am skip reason: Change-Id Iee8a428ada0b6e2127410267a13c3b688df83e6d with SHA-1 a9dda29874 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916180
Change-Id: Ia05c7c0bc83b2e93a2768d116bd46906e3220c4e
2020-06-22 18:17:32 +00:00
Cody Kesting
ba9dd48cca
Merge "Fix ConnDiags Test for invoke-after-validate and unregister CBs." into rvc-dev
2020-06-22 18:17:28 +00:00
Cody Kesting
40fe56d82d
[automerger skipped] Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev am: efaf28e9f3 -s ours am: 9f8a87c7e2 -s ours am: de5d15ee1c -s ours am: 345510005a -s ours
...
am skip reason: Change-Id Iee8a428ada0b6e2127410267a13c3b688df83e6d with SHA-1 a9dda29874 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916180
Change-Id: I2157b0a099fb51b93a2e5e14f24a409aa38afe05
2020-06-22 18:17:18 +00:00
Cody Kesting
ccaf57b38c
[automerger skipped] Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev am: efaf28e9f3 am: 254f9bb9ad am: 85d7ba6faa -s ours am: 212aa60c84 -s ours
...
am skip reason: Change-Id Iee8a428ada0b6e2127410267a13c3b688df83e6d with SHA-1 7d1159a2d4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916180
Change-Id: Ica765a313fee1b5dad77ce155c76ac07ef723106
2020-06-22 18:16:39 +00:00
Automerger Merge Worker
6d3fb92c85
Merge "[automerger skipped] Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev am: efaf28e9f3 am: 254f9bb9ad -s ours" into rvc-d1-dev-plus-aosp am: 603c2a666f -s ours
...
am skip reason: Change-Id Iee8a428ada0b6e2127410267a13c3b688df83e6d with SHA-1 a9dda29874 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916180
Change-Id: I554d589745a59560ecb60235c0254d409de3a63a
2020-06-22 18:02:13 +00:00
Cody Kesting
345510005a
[automerger skipped] Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev am: efaf28e9f3 -s ours am: 9f8a87c7e2 -s ours am: de5d15ee1c -s ours
...
am skip reason: Change-Id Iee8a428ada0b6e2127410267a13c3b688df83e6d with SHA-1 a9dda29874 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916180
Change-Id: I5e9cddd92a302f0dd6c00a219b6680e41d42e1cd
2020-06-22 18:01:02 +00:00
Cody Kesting
212aa60c84
[automerger skipped] Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev am: efaf28e9f3 am: 254f9bb9ad am: 85d7ba6faa -s ours
...
am skip reason: Change-Id Iee8a428ada0b6e2127410267a13c3b688df83e6d with SHA-1 7d1159a2d4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916180
Change-Id: Iaae33ae6ac5122ccdee09369607b0c3dc39be0fb
2020-06-22 18:00:52 +00:00
Automerger Merge Worker
603c2a666f
Merge "[automerger skipped] Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev am: efaf28e9f3 am: 254f9bb9ad -s ours" into rvc-d1-dev-plus-aosp
2020-06-22 17:41:12 +00:00
Cody Kesting
de5d15ee1c
[automerger skipped] Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev am: efaf28e9f3 -s ours am: 9f8a87c7e2 -s ours
...
am skip reason: Change-Id Iee8a428ada0b6e2127410267a13c3b688df83e6d with SHA-1 7d1159a2d4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916180
Change-Id: I2218d9906ef3837e66f77065960f7559bbb3b008
2020-06-22 17:40:56 +00:00
Cody Kesting
7d6af6b6ce
[automerger skipped] Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev am: efaf28e9f3 am: 254f9bb9ad -s ours
...
am skip reason: Change-Id Iee8a428ada0b6e2127410267a13c3b688df83e6d with SHA-1 7d1159a2d4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916180
Change-Id: I75e9d00989eb4f746a40fcc519242b89b84f23d4
2020-06-22 17:40:48 +00:00
Cody Kesting
254f9bb9ad
Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev am: efaf28e9f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916180
Change-Id: Iaf3b9637b6a365fa9f3c7ba3405949dc551ed732
2020-06-22 17:30:32 +00:00
Cody Kesting
9f8a87c7e2
[automerger skipped] Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev am: efaf28e9f3 -s ours
...
am skip reason: Change-Id Iee8a428ada0b6e2127410267a13c3b688df83e6d with SHA-1 7d1159a2d4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11916180
Change-Id: I27fb1f42bc60c4798bbb45257449142bfe0674e3
2020-06-22 17:30:14 +00:00
Cody Kesting
72e0ed49b8
Merge "resolve merge conflicts of 9e491121c5 to rvc-dev-plus-aosp. Caused by aosp/1316384" into rvc-dev-plus-aosp am: 0b4f6cbacd am: f30e887ac6 am: cc1bf75970
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11954340
Change-Id: I6e76e346aaa4cd44d3891a868e878ee97cd22aec
2020-06-22 17:21:00 +00:00
Cody Kesting
efaf28e9f3
Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." into rvc-dev
2020-06-22 17:12:41 +00:00
Cody Kesting
cc1bf75970
Merge "resolve merge conflicts of 9e491121c5 to rvc-dev-plus-aosp. Caused by aosp/1316384" into rvc-dev-plus-aosp am: 0b4f6cbacd am: f30e887ac6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11954340
Change-Id: I95e4cfe2aba6d513139a73f96a7e3ca7f17715ba
2020-06-22 17:06:28 +00:00
Cody Kesting
f30e887ac6
Merge "resolve merge conflicts of 9e491121c5 to rvc-dev-plus-aosp. Caused by aosp/1316384" into rvc-dev-plus-aosp am: 0b4f6cbacd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11954340
Change-Id: Idb0298741187f16ef24491a877d449ebd41d0dae
2020-06-22 16:53:36 +00:00
Cody Kesting
cce29fc44d
Fix ConnDiags Test for invoke-after-validate and unregister CBs.
...
This change fixes several things in ConnectivityDiagnosticsManagerTest:
- testOnConnectivityReportAvailable creates the Test Network after
registering the ConnectivityDiagnosticsCallback. This ensures that the
callback is invoked only after the network is validated (not for the
on-register behavior).
- The TestNetworkInterface created while setting up the Test Network is
held onto for the duration of each test. This ensures that the interface
is not garbage collected during the test. While the interface is not
needed for the test, this change makes it clear when the interface is
cleaned up.
- All registered ConnectivityDiagnosticsCallbacks are unregistered at
the end of each test. This ensures that all accompanying NetworkRequests
are cleaned up. If NetworkRequests are leaked, unrelated test failures
can occur (the platform limits the number of NetworkRequests per UID).
Bug: 156294356
Bug: 148032944
Test: atest android.net.cts.ConnectivityDiagnosticsManagerTest
Change-Id: I1836536fe60a65ba33170cd80e8f4996f1965d19
2020-06-22 16:03:15 +00:00
Cody Kesting
c60ca1afda
resolve merge conflicts of 9e491121c5 to rvc-dev-plus-aosp. Caused by aosp/1316384
...
Bug: 148032944
Bug: 151332031
Change-Id: I7cc024249afb59631820819fed62c2417ffbd05e
2020-06-22 14:31:05 +00:00
TreeHugger Robot
e6f5ef4c2f
Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: f42e51ec45 am: 076b296567 am: 3673374e41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026
Change-Id: I59386383ccd08a53848d9276855bf8d9d4a07ad7
2020-06-22 13:46:29 +00:00
TreeHugger Robot
928552f952
Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: 1b1f4cc178 am: 1ba1f9e9b6 am: 14cd54fddd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026
Change-Id: Idb03d9b634bc5e8b153503a274b5226ecb359851
2020-06-22 13:46:08 +00:00
TreeHugger Robot
a28197e420
Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: 1b1f4cc178 am: 9f801155e2 am: 6af0878b00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026
Change-Id: I62138c69bd5eacd7518fb41fb3a9e5d24f05d07c
2020-06-22 13:45:48 +00:00
TreeHugger Robot
3673374e41
Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: f42e51ec45 am: 076b296567
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026
Change-Id: If3d9cf4a2198f84a6a6cd196d4e8cddfe3fb30c7
2020-06-22 13:30:29 +00:00
TreeHugger Robot
14cd54fddd
Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: 1b1f4cc178 am: 1ba1f9e9b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026
Change-Id: I90c9cbc094874b6b22655fe9ec5338f79e31b6b4
2020-06-22 13:30:19 +00:00
TreeHugger Robot
6af0878b00
Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: 1b1f4cc178 am: 9f801155e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026
Change-Id: I437836e039e52460d0078647febcaed4f8c2f37f
2020-06-22 13:29:59 +00:00
TreeHugger Robot
076b296567
Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: f42e51ec45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026
Change-Id: I35067f222e3c4661d7e765af2cf531307137f398
2020-06-22 13:15:20 +00:00
TreeHugger Robot
1ba1f9e9b6
Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e am: 1b1f4cc178
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026
Change-Id: Ib51c3d6b36f04c09e6015a30abd9d2a0b86f56ed
2020-06-22 13:14:53 +00:00
TreeHugger Robot
f42e51ec45
Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026
Change-Id: I5e0a161d7fd5af4f9d097189674727e2a8a4baa2
2020-06-22 12:56:31 +00:00
TreeHugger Robot
1b1f4cc178
Merge "Add net-utils-framework-common to cts-net" into rvc-dev am: f1a476d61e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11931026
Change-Id: If5c79e058e7a12ad28bb7ad7f0a8e279c3ed78e9
2020-06-22 12:56:18 +00:00
Luke Huang
6261d27a9f
Add net-utils-framework-common to cts-net
...
In order to avoid class package missing problem, add
net-utils-framework-common in cts net test build. Also jarjar
the package name to prevent conflict.
Test: build
Test: atest DnsResolverTest
Bug: 150952393
Change-Id: I40e2d4c4945a0579f6e1923e4722b09354ff050c
2020-06-22 15:08:27 +08:00
Lorenzo Colitti
9e491121c5
Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker." am: c7f94d5052
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1316384
Change-Id: If5630e02b0ae9a15976c0d21fe48eb4a88f53cf6
2020-06-22 04:55:45 +00:00
Cody Kesting
a9dda29874
CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker.
...
This change adds a CTS test for ConnectivityDiagnostics using
CarrierPrivilegesTracker to receive permissions for
ConnectivityDiagnostics callbacks.
Specifically, the test provides CarrierPrivileges to the test package
(android.net.cts) for the active subscription via Carrier Configs
overrides. CarrierPrivilegesTracker listens to the Carrier Configs
change and matches the loaded certificate with the test package, then
includes the test package UID as an administrator for the Network in
ConnectivityService. Then, a ConnectivityDiagnosticsCallback is
registered and receives a ConnectivityReport on register for the active
subscription.
Bug: 148032944
Bug: 151332031
Test: atest ConnectivityDiagnosticsManagerTest
Change-Id: Iee8a428ada0b6e2127410267a13c3b688df83e6d
Merged-In: Iee8a428ada0b6e2127410267a13c3b688df83e6d
2020-06-22 04:44:17 +00:00
Lorenzo Colitti
c7f94d5052
Merge "CTS test ConnectivityDiagnostics via CarrierPrivilegesTracker."
2020-06-22 04:41:43 +00:00
Automerger Merge Worker
d6ac961aa6
Merge "Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: 6f26750be6 am: 22ba88d1a1" into rvc-qpr-dev-plus-aosp am: 188828ecfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437
Change-Id: I684def8e27884fe6f5374fb9e99233946cafef6e
2020-06-19 01:59:41 +00:00
Remi NGUYEN VAN
5015bba42b
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: 6f26750be6 am: 4583b55ca6 am: f0935e0615
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437
Change-Id: Idaccffa308a64ebca9a5ff1510ebe840cd5e8614
2020-06-19 01:58:32 +00:00
Remi NGUYEN VAN
90f54351ac
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: fd265a7858 am: d5f741e7af am: e1c185562e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437
Change-Id: I8ca444753c0586404a4494a3df4e419036e48d19
2020-06-19 01:57:56 +00:00
Automerger Merge Worker
188828ecfc
Merge "Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: 6f26750be6 am: 22ba88d1a1" into rvc-qpr-dev-plus-aosp
2020-06-19 01:41:35 +00:00
Remi NGUYEN VAN
a6dfb3d2de
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: 6f26750be6 am: 22ba88d1a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437
Change-Id: If18540e66de8fb30ff487ae743e8384e3c7d9a4f
2020-06-19 01:41:22 +00:00
Remi NGUYEN VAN
f0935e0615
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: 6f26750be6 am: 4583b55ca6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437
Change-Id: I3e4a7735a434c0aadcfec3c85b1a015af9e2464f
2020-06-19 01:41:07 +00:00
Remi NGUYEN VAN
e1c185562e
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: fd265a7858 am: d5f741e7af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437
Change-Id: I452192b76819b63b4c90b43cdb89452209acba7e
2020-06-19 01:40:35 +00:00
Remi NGUYEN VAN
22ba88d1a1
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: 6f26750be6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437
Change-Id: Id50a52d4f1bbaf6a3970439b703098ddf31cbbe7
2020-06-19 01:22:47 +00:00
Remi NGUYEN VAN
d5f741e7af
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d am: fd265a7858
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437
Change-Id: I826f5cff1850164e495b16ae984bac8b1777a355
2020-06-19 01:22:28 +00:00
Remi NGUYEN VAN
fd265a7858
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437
Change-Id: I773c676203488e9a323fa6a5b6c78e2006031fa0
2020-06-19 01:08:48 +00:00
Remi NGUYEN VAN
6f26750be6
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437
Change-Id: I82f049b2eba1562ae2d70cb584429cbce07c4fdf
2020-06-19 01:08:47 +00:00
Remi NGUYEN VAN
a530216c7d
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev
2020-06-19 00:49:29 +00:00
Lorenzo Colitti
6e5f7c3d2f
Merge "Update DnsPacket package name" into rvc-dev am: 7703986e4c am: 4c9d7be2ad am: 7496ceee69 am: ffaf875560
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863010
Change-Id: I69848a96c0b9260edc22ba883e7fc203a2b7f7a9
2020-06-18 17:14:52 +00:00
Lorenzo Colitti
07e5f12348
Merge "Update DnsPacket package name" into rvc-dev am: 7703986e4c am: 4c9d7be2ad am: 7f68a6cf74 am: 7effd2990c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863010
Change-Id: Ic2812c4894dce364b02fe1f624be005c1ce81169
2020-06-18 17:10:44 +00:00
Cody Kesting
4358dd55f8
Only run ConnectivityDiagnosticsManagerTest as AppModeFull. am: 7c9d2128de am: d155cba9da am: 72a7f5b3c9 am: ef8d66095c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11904000
Change-Id: Ic4f6cd08e22603db51f2238eed02921ed00b1542
2020-06-18 16:32:34 +00:00