Commit Graph

44457 Commits

Author SHA1 Message Date
Treehugger Robot
95c3f8ca89 [automerger skipped] Merge "Force only system uid can set uids allowed on restricted networks" am: 47202851ec am: a1e54368ae -s ours am: 486710cbb8 -s ours
am skip reason: Merged-In I175a831671d3e52460d28203b09f6c0dda56b61c with SHA-1 03635b3ad5 is already in history

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

Change-Id: Ib1034b01eb1da4be201e2210489b0e9abd6ed735
2021-07-02 14:36:30 +00:00
Treehugger Robot
486710cbb8 [automerger skipped] Merge "Force only system uid can set uids allowed on restricted networks" am: 47202851ec am: a1e54368ae -s ours
am skip reason: Merged-In I175a831671d3e52460d28203b09f6c0dda56b61c with SHA-1 03635b3ad5 is already in history

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

Change-Id: I30b118cbcf773b9a382a50ccc5f5799b29afc9e0
2021-07-02 14:19:38 +00:00
Treehugger Robot
9221ed06e2 Merge "Allow non-VPNs to have underlying networks." am: 5903d5646c am: 9a7c9c3c06 am: 8d1e3166cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753619

Change-Id: I397060ae88f5c020ce9df080807f64c05742aa67
2021-07-02 14:07:43 +00:00
Treehugger Robot
a1e54368ae Merge "Force only system uid can set uids allowed on restricted networks" am: 47202851ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755052

Change-Id: I20ad7457e8e91b35b6ee0659b1ec1fae3f008fe8
2021-07-02 14:07:31 +00:00
Treehugger Robot
8d1e3166cd Merge "Allow non-VPNs to have underlying networks." am: 5903d5646c am: 9a7c9c3c06
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753619

Change-Id: Ic2188f15ce354e44436d4edc7500859e4eb09308
2021-07-02 13:55:33 +00:00
Treehugger Robot
47202851ec Merge "Force only system uid can set uids allowed on restricted networks" 2021-07-02 13:52:50 +00:00
Treehugger Robot
9a7c9c3c06 Merge "Allow non-VPNs to have underlying networks." am: 5903d5646c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753619

Change-Id: Ie6894fc292e5d6ef7f084abcf3ddbdfdd7540648
2021-07-02 13:38:21 +00:00
Treehugger Robot
5903d5646c Merge "Allow non-VPNs to have underlying networks." 2021-07-02 13:28:01 +00:00
Paul Hu
da81d316b0 Merge "Use Netd new added/removed uid range methods" into sc-dev am: 29194db12f am: 39828864dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911836

Change-Id: I16ff8e265698963b79d6ce1d26637bfcb342c667
2021-07-02 12:34:26 +00:00
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
39828864dd 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: Ie2a855902fd4ad04624a714c71bfaede6f0098e3
2021-07-02 12:20:24 +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
paulhu
92f128c51c 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
Merged-In: I175a831671d3e52460d28203b09f6c0dda56b61c

Change-Id: I175a831671d3e52460d28203b09f6c0dda56b61c
2021-07-02 20:04:50 +08:00
Paul Hu
7f2d4f835e Merge "Force only system uid can set uids allowed on restricted networks" into sc-dev am: 77739d37b3 am: 93e9d0c1f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172131

Change-Id: Ic1e1573a486e4483f2d59187e2313dde64e80e75
2021-07-02 11:16:10 +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
93e9d0c1f6 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: Ic688c1515f55de1a7f1ac784c5f6172429ac1902
2021-07-02 11:02:26 +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
Automerger Merge Worker
119d086ecd Merge "[automerger skipped] Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" into sc-dev am: f5f8e4e3a5 -s ours am: fb000b3e5d -s ours" into sc-v2-dev-plus-aosp 2021-07-02 10:03:11 +00:00
TreeHugger Robot
6c3ca698d1 [automerger skipped] Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" into sc-dev am: f5f8e4e3a5 -s ours am: fb000b3e5d -s ours
am skip reason: Merged-In Ie9d6b3e39ef16813c4be3979900d226c8f3d656d with SHA-1 605e77055c is already in history

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

Change-Id: I93093687bada2cd034caf606c78d8a1a74fea37a
2021-07-02 10:03:06 +00:00
TreeHugger Robot
d7b40662d3 [automerger skipped] Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" into sc-dev am: f5f8e4e3a5 am: 6018e38cad -s ours
am skip reason: Merged-In Ie9d6b3e39ef16813c4be3979900d226c8f3d656d with SHA-1 605e77055c is already in history

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

Change-Id: I7629c9f65cfc3efcaf8928561aebfdce26480fba
2021-07-02 10:03:04 +00:00
Lorenzo Colitti
bd079455f1 Allow non-VPNs to have underlying networks.
Certain network types, like the VCN, have underlying
networks for the purpose of data usage, but do not want to
propagate the underlying network capabilities.

Allow these networks to set underlying networks, but continue
not to propagate the capabilities.

Bug: 190620024
Test: new unit test
Change-Id: I53d6080f48707ff3c37fbfbef534284ba77a7432
2021-07-02 18:48:25 +09: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
fb000b3e5d [automerger skipped] Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" into sc-dev am: f5f8e4e3a5 -s ours
am skip reason: Merged-In Ie9d6b3e39ef16813c4be3979900d226c8f3d656d with SHA-1 605e77055c is already in history

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

Change-Id: I21a919155ab9216518f4f748ba88f8f65ff196fa
2021-07-02 09:47:23 +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
872462b2d7 [automerger skipped] Merge "Remove workarounds to use core platform API" into sc-dev am: 169f43d117 -s ours am: fc31c65d5a -s ours
am skip reason: Merged-In Id448be03b679f832edb24f1b77f471227faf5268 with SHA-1 b2e919f9da is already in history

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

Change-Id: Ie828ef88c1b440aed0088ec75d7872fbc7d162e5
2021-07-02 09:22:22 +00:00
TreeHugger Robot
fc31c65d5a [automerger skipped] Merge "Remove workarounds to use core platform API" into sc-dev am: 169f43d117 -s ours
am skip reason: Merged-In Id448be03b679f832edb24f1b77f471227faf5268 with SHA-1 b2e919f9da is already in history

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

Change-Id: If14c8e0083cd4b3e673756a2bf6d455c0f88a39a
2021-07-02 09:07:46 +00:00
TreeHugger Robot
c033cbb573 [automerger skipped] Merge "Remove workarounds to use core platform API" into sc-dev am: 169f43d117 am: 973f785b73 -s ours
am skip reason: Merged-In Id448be03b679f832edb24f1b77f471227faf5268 with SHA-1 b2e919f9da is already in history

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

Change-Id: Id9225242f4b03115f3625fb5e6c2f6ba060ab0c3
2021-07-02 09:04:21 +00:00
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
973f785b73 Merge "Remove workarounds to use core platform API" into sc-dev am: 169f43d117
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15175216

Change-Id: I4e3a3ed12857c9bb59097c79c0b95f68c06d0540
2021-07-02 08:55:32 +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
169f43d117 Merge "Remove workarounds to use core platform API" into sc-dev 2021-07-02 08:53:34 +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