Remi NGUYEN VAN
899a99588e
[automerger skipped] Fix CtsNetTestCases in instant mode am: 21e5140ff4 -s ours
...
am skip reason: Merged-In I7a7b0169a3a495bb359dc1f72e56937dcdc5b8a8 with SHA-1 f9d8719d64 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15179352
Change-Id: I120c20153d3731b501afce88f3edce943da9d6f6
2021-07-02 07:31:36 +00:00
Lorenzo Colitti
a27e4fa269
Merge changes from topic "conn-diags-skipped" am: 05752a5316 am: da7f313fb4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1665082
Change-Id: I11d040232c8e24747966c7aa22a9c3bc7c3150c4
2021-07-02 06:56:58 +00:00
Cody Kesting
7efec74a37
Report result SKIPPED in ConnDiags if the network is not validated. am: f1120be78b am: c6abf3d60c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718510
Change-Id: I499fa45099d8c2cc05797051d7853b97ed2234e8
2021-07-02 06:56:54 +00:00
Lorenzo Colitti
da7f313fb4
Merge changes from topic "conn-diags-skipped" am: 05752a5316
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1665082
Change-Id: I8ba883ee8a92c6e6b74b555d1b89448a763af1b3
2021-07-02 06:43:22 +00:00
Cody Kesting
c6abf3d60c
Report result SKIPPED in ConnDiags if the network is not validated. am: f1120be78b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718510
Change-Id: I4135072382e447206ef7634e6e43b7ad5186a00d
2021-07-02 06:43:20 +00:00
Lorenzo Colitti
05752a5316
Merge changes from topic "conn-diags-skipped"
...
* changes:
Update ConnDiags CTS test to expect validation result SKIPPED.
Report result SKIPPED in ConnDiags if the network is not validated.
2021-07-02 06:26:57 +00:00
Remi NGUYEN VAN
21e5140ff4
Fix CtsNetTestCases in instant mode
...
Skip tests that cannot run in instant mode, as WifiManager is not
available, and the test cannot bind to sockets in instant mode.
Bug: 192284219
Test: atest CtsNetTestCases -- --enable-parameterized-modules \
--abi arm64-v8a --module-parameter instant_app
Original-Change: https://android-review.googlesource.com/1753823
Merged-In: I7a7b0169a3a495bb359dc1f72e56937dcdc5b8a8
Change-Id: I7a7b0169a3a495bb359dc1f72e56937dcdc5b8a8
2021-07-02 06:04:35 +00:00
Lucas Lin
c698db1256
[automerger skipped] Merge "Print the result of command when test is failed" into sc-dev am: 0def47421d -s ours
...
am skip reason: Merged-In I63cd4b043e7c70775156aa5244d25ee2268f9f32 with SHA-1 5fe3926a11 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165009
Change-Id: Iefd28dfafead2c3ea019ee7e241e7a55baccaaed
2021-07-02 05:43:43 +00:00
Lucas Lin
0def47421d
Merge "Print the result of command when test is failed" into sc-dev
2021-07-02 05:27:45 +00:00
Orion Hodson
504d5ac68b
[automerger skipped] Remove dependency on stable.core.platform.api.stubs am: 5e5c287d6b -s ours
...
am skip reason: Merged-In I06cbc7e06e112d61575fad6ad0783348c94e3df2 with SHA-1 c3815ee358 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15163615
Change-Id: Iaddcc6f6dca44c333073032a172c91f0dc7b323d
2021-07-02 04:57:13 +00:00
Remi NGUYEN VAN
df1ab0aa2b
Merge "Remove workarounds to use core platform API" am: 78dcc73e4c am: 31dbe8b122
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754889
Change-Id: Ib01bbc0cfec540a6e811ac874c4e731734490dfb
2021-07-02 04:44:46 +00:00
Remi NGUYEN VAN
31dbe8b122
Merge "Remove workarounds to use core platform API" am: 78dcc73e4c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754889
Change-Id: Ia0f8f5ab44267b0007364e6c1959edf22c952300
2021-07-02 04:41:25 +00:00
Treehugger Robot
505f30c572
Merge "Test Entitlement when telephony is present" am: 93773f0aa0 am: f780194b25
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735336
Change-Id: I0df5ed172ea00f2d2bf44e8f37c1b417fc9245b7
2021-07-02 04:41:18 +00:00
Remi NGUYEN VAN
78dcc73e4c
Merge "Remove workarounds to use core platform API"
2021-07-02 04:37:23 +00:00
Treehugger Robot
f780194b25
Merge "Test Entitlement when telephony is present" am: 93773f0aa0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735336
Change-Id: Ib5734aca35f2aee00d63b5684f6dd06b1063ef26
2021-07-02 04:37:15 +00:00
Remi NGUYEN VAN
899b99040c
Merge "Fix CtsNetTestCases in instant mode" am: 81be2bd036 am: b786afa6e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753823
Change-Id: I283c7e665673f148b447847ff1d96a2efa70f11c
2021-07-02 04:37:08 +00:00
Treehugger Robot
93773f0aa0
Merge "Test Entitlement when telephony is present"
2021-07-02 04:28:18 +00:00
Remi NGUYEN VAN
b786afa6e3
Merge "Fix CtsNetTestCases in instant mode" am: 81be2bd036
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753823
Change-Id: I84ec31354974c4913d6c4ac94a955054697180ff
2021-07-02 04:19:02 +00:00
Remi NGUYEN VAN
81be2bd036
Merge "Fix CtsNetTestCases in instant mode"
2021-07-02 04:07:05 +00:00
Paul Hu
6bc989a586
Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" am: 7079b72fa6 am: 9e98dea823
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751023
Change-Id: I18ab49638b3c51f4217c84dcf18a5b4fc7007181
2021-07-02 01:44:52 +00:00
Paul Hu
9e98dea823
Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" am: 7079b72fa6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751023
Change-Id: I4c87ecdd3d05305aa47a7569a22f370aedf4b585
2021-07-02 01:26:27 +00:00
Paul Hu
7079b72fa6
Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature"
2021-07-02 01:10:56 +00:00
Remi NGUYEN VAN
b2e919f9da
Remove workarounds to use core platform API
...
Core platform API stubs are now correctly included in module_current and
system_server_current, so workarounds used to use such APIs can be
removed.
OsCompat and InetAddressCompat were only necessary because manually
adding the stubs did not resolve the problem for classes that had
public API stubs, which shadowed the module API stubs.
The manual stubs dependency was already removed in another change. Also
remove the service jar dependency on android_system_server_stubs_current
as it is already included in sdk_version system_server_current.
Bug: 183097033
Test: atest CtsNetTestCases
Change-Id: Id448be03b679f832edb24f1b77f471227faf5268
2021-07-02 10:05:07 +09:00
Orion Hodson
5e5c287d6b
Remove dependency on stable.core.platform.api.stubs
...
Bug: 183097033
Test: m droid
Original-Change: https://android-review.googlesource.com/1751523
Merged-In: I06cbc7e06e112d61575fad6ad0783348c94e3df2
Change-Id: I06cbc7e06e112d61575fad6ad0783348c94e3df2
2021-07-02 00:42:52 +00:00
Cody Kesting
69ec69341e
Update ConnDiags CTS test to expect validation result SKIPPED.
...
This CL updates ConnectivityDiagnosticsManagerTest to expect
NETWORK_VALIDATION_RESULT_SKIPPED for its TestNetworks. The tests also
expect a ConnectivityReport to be sent for all calls to
ConnectivityManager#reportNetworkConnectivity.
Bug: 162407730
Test: atest ConnectivityDiagnosticsManagerTest
Change-Id: I525ea22a38c54a6b5b969a70301852e7af12849c
2021-07-01 17:38:17 -07:00
Cody Kesting
f1120be78b
Report result SKIPPED in ConnDiags if the network is not validated.
...
This CL updates ConnectivityDiagnostics to report
NETWORK_VALIDATION_RESULT_SKIPPED when the platform does not validate
the reported Network. This CL also updates the behavior for
ConnectivityManager#reportNetworkConnectivity, such that it will always
generate a ConnectivityReport on the reported network. If the reported
connectivity does not match the known connectivity of this network, the
network is revalidated and a report is generated. Otherwise,
revalidation is not performed and the cached ConnectivityReport is sent
instead.
This CL also updates ConnDiags behavior for calls to
ConnectivityManager#reportNetworkConnectivity. Specifically, ConnDiags
callbacks are only notified for these calls if:
a) the call causes the Network to be re-validated, or
b) the callback registrant was the caller of
#reportNetworkConnectivity().
For b), the caller is always guaranteed to receive a ConnectivityReport
(a fresh report if the Network is re-validated, else the cached report).
Bug: 162407730
Test: atest FrameworksNetTests ConnectivityDiagnosticsManagerTest
Change-Id: I78b78919d5b0f09348dfdd5fdb37418b8c7f861f
2021-07-01 17:38:16 -07:00
Sudheer Shanka
ba4f3650c2
[automerger skipped] Merge "Skip NetworkPolicyManagerTest on unsupported devices." into sc-dev am: 0a224da8d3 -s ours
...
am skip reason: Merged-In Ib90f0045cb574ada792c5d43fcc359c22d20f3a4 with SHA-1 f90750e26a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15167635
Change-Id: I53c56729ec76a216edfc4a4c7632be68d72ec604
2021-07-01 23:39:26 +00:00
Sudheer Shanka
0a224da8d3
Merge "Skip NetworkPolicyManagerTest on unsupported devices." into sc-dev
2021-07-01 23:28:45 +00:00
Orion Hodson
f59ce8f0cc
Merge "Remove dependency on stable.core.platform.api.stubs" am: f15f2769b4 am: cfa0d8026b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751523
Change-Id: I626a0817b64678929054fd26aa0ca22372ca2f2c
2021-07-01 19:29:04 +00:00
Orion Hodson
cfa0d8026b
Merge "Remove dependency on stable.core.platform.api.stubs" am: f15f2769b4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751523
Change-Id: I94b8ca7d55df35e5f118b69a07b5152b2d0b207b
2021-07-01 19:08:36 +00:00
Orion Hodson
f15f2769b4
Merge "Remove dependency on stable.core.platform.api.stubs"
2021-07-01 18:53:17 +00:00
Sudheer Shanka
d80b8cc4a9
Merge "Skip tests on unsupported devices." am: 0dc6206752 am: f8110a2cda
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753865
Change-Id: Ib0d27578e15d6f4af77723700ca564ecf15c0f4e
2021-07-01 17:28:49 +00:00
Sudheer Shanka
f8110a2cda
Merge "Skip tests on unsupported devices." am: 0dc6206752
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753865
Change-Id: Icaea4cd21c2fa68e7340db2fe82a4b41687470a5
2021-07-01 17:16:06 +00:00
Sudheer Shanka
fe89aaad47
Skip NetworkPolicyManagerTest on unsupported devices.
...
Fixes: 192473577
Test: atest CtsHostsideNetworkTests:HostsideNetworkPolicyManagerTests
Change-Id: Ib90f0045cb574ada792c5d43fcc359c22d20f3a4
Merged-In: Ib90f0045cb574ada792c5d43fcc359c22d20f3a4
2021-07-01 17:10:02 +00:00
Sudheer Shanka
0dc6206752
Merge "Skip tests on unsupported devices."
2021-07-01 16:59:46 +00:00
TreeHugger Robot
7a10686a8d
[automerger skipped] Merge "Make notification icons and autocancel overlayable" into sc-dev am: 2a512b4a16 -s ours
...
am skip reason: Merged-In Ibbb765a5e828b8b870cbfb81e89df2dbd2828be7 with SHA-1 3a8198c3ba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172450
Change-Id: I887655da5225567835f9396decbee63ef7c36b62
2021-07-01 15:36:32 +00:00
TreeHugger Robot
2a512b4a16
Merge "Make notification icons and autocancel overlayable" into sc-dev
2021-07-01 15:24:43 +00:00
TreeHugger Robot
8ddf81e278
[automerger skipped] Merge "Dump the protocol of IPv4 offload rule" into sc-dev am: a575bce0ed -s ours
...
am skip reason: Merged-In Idae1042cfb454cc97b9b103587f11bc0700e0787 with SHA-1 3004f0d8d9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164997
Change-Id: I50aaf9f2abe8b6be6decf3bc8eda8c385004651f
2021-07-01 11:02:41 +00:00
TreeHugger Robot
4184b44a2a
[automerger skipped] Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev am: 86a118c060 -s ours
...
am skip reason: Merged-In Ie7f637248302f3e6b61be69ef4c6a7a906e69275 with SHA-1 4f0546ccbe is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15108489
Change-Id: If270a8bb58cb47feca8e8d01b43b12c1ecfe3e24
2021-07-01 11:02:32 +00:00
TreeHugger Robot
a575bce0ed
Merge "Dump the protocol of IPv4 offload rule" into sc-dev
2021-07-01 10:54:44 +00:00
TreeHugger Robot
86a118c060
Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev
2021-07-01 10:53:27 +00:00
Treehugger Robot
eb650c896c
Merge "Make notification icons and autocancel overlayable" am: 2c7e0714c6 am: 0cdc510d6c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753822
Change-Id: If48517cccabc9625cb5a7cc01babc3cff02d639b
2021-07-01 10:48:08 +00:00
Treehugger Robot
8ef6bfe5ae
Make notification icons and autocancel overlayable
...
Allow overlays to change the connectivity notification icons, and
whether the notifications are auto-cancelled.
This does not change default behavior, but is necessary to allow vendors
to adapt the notifications to their standards.
Bug: 173171709
Bug: 172048052
Test: atest NetworkNotificationManagerTest
Added test overlay, verified icon replaced
Original-Change: https://android-review.googlesource.com/1753822
Merged-In: Ibbb765a5e828b8b870cbfb81e89df2dbd2828be7
Change-Id: Ibbb765a5e828b8b870cbfb81e89df2dbd2828be7
2021-07-01 10:44:09 +00:00
Treehugger Robot
0cdc510d6c
Merge "Make notification icons and autocancel overlayable" am: 2c7e0714c6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753822
Change-Id: I77e1bcc4190656d3ea717575ebfc58d07df6b24f
2021-07-01 10:27:29 +00:00
Luke Huang
0b5b15744c
[automerger skipped] Merge "Fix the comments from aosp/1719018" into sc-dev am: bf9cb4dd18 -s ours
...
am skip reason: Merged-In I0953887d1d92a644a29a2e80521469c8cc2aa2fc with SHA-1 05b013c83f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15076676
Change-Id: I654e55beec5fed0775907e74e4b7a102cdbdbae1
2021-07-01 10:27:02 +00:00
Lucas Lin
a10f2a5f25
Print the result of command when test is failed
...
When ConnectivityManagerTest#testGetMultipathPreference() is
failed, it only prints "Unexpected format from cmd netpolicy" and
it's not helpful.
Print the result of command can help people to know what's the
difference between expected result and actual result.
Bug: 187921745
Test: atest CtsNetTestCases:ConnectivityManagerTest#testGetMultipathPreference
Original-Change: https://android-review.googlesource.com/1749262
Merged-In: I63cd4b043e7c70775156aa5244d25ee2268f9f32
Change-Id: I63cd4b043e7c70775156aa5244d25ee2268f9f32
2021-07-01 10:11:13 +00:00
Luke Huang
bf9cb4dd18
Merge "Fix the comments from aosp/1719018" into sc-dev
2021-07-01 09:49:46 +00:00
Treehugger Robot
2c7e0714c6
Merge "Make notification icons and autocancel overlayable"
2021-07-01 09:49:37 +00:00
Remi NGUYEN VAN
f9d8719d64
Fix CtsNetTestCases in instant mode
...
Skip tests that cannot run in instant mode, as WifiManager is not
available, and the test cannot bind to sockets in instant mode.
Bug: 192284219
Test: atest CtsNetTestCases -- --enable-parameterized-modules \
--abi arm64-v8a --module-parameter instant_app
Change-Id: I7a7b0169a3a495bb359dc1f72e56937dcdc5b8a8
2021-07-01 18:48:27 +09:00
Lucas Lin
b0ba88e647
[automerger skipped] Merge "Simplify the return condition in stop()" into sc-dev am: b851d80de2 -s ours
...
am skip reason: Merged-In I2454c1c080d8954dd3785d4ac6e96fc4131fdb47 with SHA-1 40d931c474 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164994
Change-Id: I1735c7d1c24693f7003bc52a98cae39e41832517
2021-07-01 09:35:47 +00:00