Paul Hu
8daae3a98d
Merge "Use Netd new added/removed uid range methods" into sc-dev am: 29194db12f am: 3dc7387fdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911836
Change-Id: Iac2d178795d0864ae8279aa8fa79a4a0d680fb66
2021-07-02 12:34:01 +00:00
Paul Hu
3dc7387fdb
Merge "Use Netd new added/removed uid range methods" into sc-dev am: 29194db12f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911836
Change-Id: I5639000ecd2669b677c98e359cb042ac17a69efc
2021-07-02 12:21:16 +00:00
Paul Hu
29194db12f
Merge "Use Netd new added/removed uid range methods" into sc-dev
2021-07-02 12:08:35 +00:00
Paul Hu
12b0f97cd7
Merge "Force only system uid can set uids allowed on restricted networks" into sc-dev am: 77739d37b3 am: 75ca971c66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172131
Change-Id: I83ddf631f48452f92967043201c029e80b413587
2021-07-02 11:15:44 +00:00
Paul Hu
75ca971c66
Merge "Force only system uid can set uids allowed on restricted networks" into sc-dev am: 77739d37b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172131
Change-Id: I0e35396ef80f046aa31931940714dee65a7b781c
2021-07-02 11:02:59 +00:00
Paul Hu
77739d37b3
Merge "Force only system uid can set uids allowed on restricted networks" into sc-dev
2021-07-02 10:46:19 +00:00
TreeHugger Robot
6018e38cad
Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" into sc-dev am: f5f8e4e3a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15179351
Change-Id: I65363d10cf9ff08cbc9bde2423bcdeca107b94e7
2021-07-02 09:48:22 +00:00
TreeHugger Robot
f5f8e4e3a5
Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" into sc-dev
2021-07-02 09:27:38 +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
8d75184baf
Merge "Test Entitlement when telephony is present" into sc-dev
2021-07-02 08:29:15 +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
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
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
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
0def47421d
Merge "Print the result of command when test is failed" into sc-dev
2021-07-02 05:27:45 +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
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
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
81be2bd036
Merge "Fix CtsNetTestCases in instant mode"
2021-07-02 04:07:05 +00:00
Paul Hu
07950df234
Change to REQUEST from LISTEN for mobile data preferred uids feature
...
- If Mobile data always on is OFF, mobile data preferred uids
feature does not work.
- We need to request mobile data when MDO list is not empty.
Bug: 171872461
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases
Signed-off-by: Ansik <ansik.shin@samsung.com >
Original-Change: https://android-review.googlesource.com/1751023
Merged-In: Ie9d6b3e39ef16813c4be3979900d226c8f3d656d
Change-Id: Ie9d6b3e39ef16813c4be3979900d226c8f3d656d
2021-07-02 03:03:07 +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
7079b72fa6
Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature"
2021-07-02 01:10:56 +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
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
Sudheer Shanka
0a224da8d3
Merge "Skip NetworkPolicyManagerTest on unsupported devices." into sc-dev
2021-07-01 23:28:45 +00:00
Sudheer Shanka
5bb04c584d
Merge "Skip tests on unsupported devices." am: 0dc6206752 am: f8110a2cda am: d80b8cc4a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753865
Change-Id: I6ed43269eb2c061b342afef1d109078b345370d1
2021-07-01 17:49:24 +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
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
5e427a411e
Merge "Make notification icons and autocancel overlayable" into sc-dev am: 2a512b4a16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172450
Change-Id: I07a3e28797aaff19d7edd1ac7c965399dd49eaaa
2021-07-01 15:37:38 +00:00
TreeHugger Robot
2a512b4a16
Merge "Make notification icons and autocancel overlayable" into sc-dev
2021-07-01 15:24:43 +00:00
paulhu
03635b3ad5
Force only system uid can set uids allowed on restricted networks
...
- Check whether calling UID/PID is system_server.
- For CTS test, enforce NETWORK_SETTINGS permission otherwise if
it's a debug build.
Bug: 175199465
Test: atest FrameworksNetTests
Test: atest ConnectivityManagerTest#testUidsAllowedOnRestrictedNetworks
Ignore-AOSP-First: Need cherry-pick
Change-Id: I175a831671d3e52460d28203b09f6c0dda56b61c
2021-07-01 23:01:41 +08:00
TreeHugger Robot
1f798f9800
Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev am: 86a118c060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15108489
Change-Id: I19519b91d29533ff459c14bca0038d6832db1da6
2021-07-01 11:03:31 +00:00
TreeHugger Robot
86a118c060
Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev
2021-07-01 10:53:27 +00:00
Treehugger Robot
a1e4470a3a
Merge "Make notification icons and autocancel overlayable" am: 2c7e0714c6 am: 0cdc510d6c am: eb650c896c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753822
Change-Id: Icd0524fac36d10aeeb20fbe9952e07b87e4ecb4f
2021-07-01 10:49:26 +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
Luke Huang
de8cdb81c6
Merge "Fix the comments from aosp/1719018" into sc-dev am: bf9cb4dd18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15076676
Change-Id: I1645777332b870001c496b464693eb96c223e78b
2021-07-01 10:28:35 +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