Commit Graph

44422 Commits

Author SHA1 Message Date
TreeHugger Robot
c6ec8deb1a [automerger skipped] Merge "Test Entitlement when telephony is present" into sc-dev am: 8d75184baf am: 991b0ee82a -s ours
am skip reason: Merged-In I9fbb7141691fbbf8685b46359c050e0385928805 with SHA-1 0cc6f3b99d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14947613

Change-Id: Ied4a661098018ae1d8c85b89375547725b24a57b
2021-07-02 09:04:03 +00:00
TreeHugger Robot
1223ac9c11 [automerger skipped] Merge "Test Entitlement when telephony is present" into sc-dev am: 8d75184baf -s ours am: 548002b286 -s ours
am skip reason: Merged-In I9fbb7141691fbbf8685b46359c050e0385928805 with SHA-1 e0e656c9b3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14947613

Change-Id: Ieaca92c3f3a82dd32b4badedb94b47ec493707de
2021-07-02 08:55:25 +00:00
TreeHugger Robot
991b0ee82a Merge "Test Entitlement when telephony is present" into sc-dev am: 8d75184baf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14947613

Change-Id: I784138f5eef0b99a338fe28724f9002b5ae13bbb
2021-07-02 08:51:35 +00:00
TreeHugger Robot
548002b286 [automerger skipped] Merge "Test Entitlement when telephony is present" into sc-dev am: 8d75184baf -s ours
am skip reason: Merged-In I9fbb7141691fbbf8685b46359c050e0385928805 with SHA-1 e0e656c9b3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14947613

Change-Id: Id52c494bca9acce7dc4363ad81038552ef94a723
2021-07-02 08:43:08 +00:00
TreeHugger Robot
8d75184baf Merge "Test Entitlement when telephony is present" into sc-dev 2021-07-02 08:29:15 +00:00
Remi NGUYEN VAN
bbc86619c6 [automerger skipped] Fix CtsNetTestCases in instant mode am: 21e5140ff4 am: 48a0dbefbd -s ours
am skip reason: Merged-In I7a7b0169a3a495bb359dc1f72e56937dcdc5b8a8 with SHA-1 21e5140ff4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15179352

Change-Id: I75e11ba2086e6808b2fee2d40c5780e464ab4055
2021-07-02 07:47:34 +00:00
Remi NGUYEN VAN
4dab04706b [automerger skipped] Fix CtsNetTestCases in instant mode am: 21e5140ff4 -s ours am: 899a99588e -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: Iffefe28dae7ec4e91dbcce24c1e2da4824de761a
2021-07-02 07:40:24 +00:00
Remi NGUYEN VAN
48a0dbefbd Fix CtsNetTestCases in instant mode am: 21e5140ff4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15179352

Change-Id: Iea06a9e9a3cbacecf9a5ada088ef3a25fc779e45
2021-07-02 07:32:20 +00:00
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
363526b6d2 Merge changes from topic "conn-diags-skipped" am: 05752a5316 am: da7f313fb4 am: a27e4fa269
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1665082

Change-Id: Ia7264c28b0260c18c6f489371fdf6856e96a9539
2021-07-02 07:14:37 +00:00
Cody Kesting
fd8b1fbca5 Report result SKIPPED in ConnDiags if the network is not validated. am: f1120be78b am: c6abf3d60c am: 7efec74a37
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1718510

Change-Id: Iddfdafdcfafbc5a0ee70be0de489d6f3c716e9dd
2021-07-02 07:14:31 +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
910c47f6d7 [automerger skipped] Merge "Print the result of command when test is failed" into sc-dev am: 0def47421d am: be95328ab1 -s ours
am skip reason: Merged-In I63cd4b043e7c70775156aa5244d25ee2268f9f32 with SHA-1 a10f2a5f25 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165009

Change-Id: Ic52d5936d2bdd5f45138409ba49f93b094efc7f8
2021-07-02 06:00:38 +00:00
Lucas Lin
59d1bf6985 [automerger skipped] Merge "Print the result of command when test is failed" into sc-dev am: 0def47421d -s ours am: c698db1256 -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: I3fceac14f588231a711224ec943d9eee88280663
2021-07-02 05:52:27 +00:00
Treehugger Robot
0cc6f3b99d Test Entitlement when telephony is present
bug: 187331752
Test: atest android.tethering.test.TetheringManagerTest
Original-Change: https://android-review.googlesource.com/1735336
Merged-In: I9fbb7141691fbbf8685b46359c050e0385928805
Change-Id: I9fbb7141691fbbf8685b46359c050e0385928805
2021-07-02 05:48:23 +00:00
Lucas Lin
be95328ab1 Merge "Print the result of command when test is failed" into sc-dev am: 0def47421d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15165009

Change-Id: I953b20df723ee06cbc415a5bfe90ea34298b09bd
2021-07-02 05:44:33 +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
29fb1c1477 [automerger skipped] Remove dependency on stable.core.platform.api.stubs am: 5e5c287d6b -s ours am: 504d5ac68b -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: I2b2b0bbd10c57222f53551a0a56ceacd0270476d
2021-07-02 05:10:02 +00:00
Orion Hodson
faebcc6419 [automerger skipped] Remove dependency on stable.core.platform.api.stubs am: 5e5c287d6b am: ce47122578 -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: I68a23288a5a33eeb7ac5eb01c4416d7c19fd6fea
2021-07-02 05:09:53 +00:00
Orion Hodson
ce47122578 Remove dependency on stable.core.platform.api.stubs am: 5e5c287d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15163615

Change-Id: Iae64d04b662b76582b7579d541d90f6acf6f90ad
2021-07-02 04:57:59 +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
c46754a188 Merge "Remove workarounds to use core platform API" am: 78dcc73e4c am: 31dbe8b122 am: df1ab0aa2b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754889

Change-Id: I30dc144f261cf8d284ec770935ecc75c8503cf9d
2021-07-02 04:49:23 +00:00
Treehugger Robot
4b650196a0 Merge "Test Entitlement when telephony is present" am: 93773f0aa0 am: f780194b25 am: 505f30c572
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735336

Change-Id: If2b92a9711a7fc12636ed54243f92f25a301825b
2021-07-02 04:49:09 +00:00
Remi NGUYEN VAN
1f0def333d Merge "Fix CtsNetTestCases in instant mode" am: 81be2bd036 am: b786afa6e3 am: 899b99040c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753823

Change-Id: I6dd0bdcaa8720e4ba0dea8e314e1b15cf6b233f6
2021-07-02 04:48:56 +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
b68eda8105 Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" am: 7079b72fa6 am: 9e98dea823 am: 6bc989a586
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751023

Change-Id: Ie2685f7264dd127048b8b36539d6739458248302
2021-07-02 02:03:14 +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
fc60f96e94 [automerger skipped] Merge "Skip NetworkPolicyManagerTest on unsupported devices." into sc-dev am: 0a224da8d3 -s ours am: ba4f3650c2 -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: I00016820f6414f7b70f18e0501dd72b9557a3088
2021-07-01 23:55:01 +00:00
Sudheer Shanka
a51912a805 [automerger skipped] Merge "Skip NetworkPolicyManagerTest on unsupported devices." into sc-dev am: 0a224da8d3 am: 311b28c020 -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: Ifd5205c1f1a50da430cba218acd3b48c746cd411
2021-07-01 23:52:14 +00:00
Sudheer Shanka
311b28c020 Merge "Skip NetworkPolicyManagerTest on unsupported devices." into sc-dev am: 0a224da8d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15167635

Change-Id: Ibcdf57e5dad03cea9e07cc18c1c3c5b6acdcb5f0
2021-07-01 23:40:25 +00:00