Commit graph

63,822 commits

Message SHA1
Merge "Add tests to verify app has network access in onResume." into tm-dev
Sudheer Shanka   authored and   Android (Google) Code Review   commited 2022-04-28 22:00:08 +00:00
fdbffad274
Merge "Add NearbyDeviceParcelable to PresenceDevice conversion in NearbyManager Add empty salt field in callers." into tm-dev
Xinyi Zhou   authored and   Android (Google) Code Review   commited 2022-04-28 06:30:44 +00:00
4111a704ec
Disable data stall recovery for DnsResolverTest
DnsResolverTest#testPrivateDnsBypass is flaky due to data stall recovery
attempting to tear down and reconnect the disconnected connection.
Disable data stall recovery so the test can run without a potential race
condition due to data stall recovery.

Test: atest DnsResolverTest
Bug: 230427128
Change-Id: I3057540d1b261bd51513c568072c8252c5d6959a
Merged-In: I3057540d1b261bd51513c568072c8252c5d6959a

Sarah Chin   authored and   Lorenzo Colitti   commited 2022-04-28 00:03:42 +00:00
53b1174d90
Zero out Mainline BLE broadcast
https://paste.googleplex.com/5913900169035776

Test: -m and verified logs
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I8a3661d1d0ce990727d1f9944b677d75decac4e4

Xinyi Zhou   commited 2022-04-27 14:04:23 -07:00
76215df659
Add tests to verify app has network access in onResume.
We already have tests that verify this but these new tests
launch the activity repeatedly a few times and verify the
network access as there are multiple race conditions
involving AMS, NPMS and the app that could result in an
inconsistent network rules state.

Bug: 226299593
Test: atest atest tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest
Change-Id: I6372820fd2b21ebd759a3c44c7280c6699726bde
Merged-In: I6372820fd2b21ebd759a3c44c7280c6699726bde

Sudheer Shanka   commited 2022-04-27 13:23:36 -07:00
fc8ba515da
Add NearbyDeviceParcelable to PresenceDevice conversion in NearbyManager
Add empty salt field in callers.

Test: -m
Bug: 230030362
Change-Id: I30d4f4144f41f2e72e6673868b565f7f3c5d84b1
Ignore-AOSP-First: nearby_not_in_aosp_yet

Xinyi Zhou   commited 2022-04-27 11:29:58 -07:00
15c2547bcc
Merge "Add EthernetTestInterface to list of created interfaces" am: 79b38b491c am: 1591891486
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063053

Change-Id: I0e010b173550446787e0a438179a29b7b4a79a79
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-25 11:21:58 +00:00
a83f91ef24
Merge "Add EthernetTestInterface to list of created interfaces" am: 79b38b491c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063053

Change-Id: I0bf17f837bfbe4e6558781d807509b2014658574
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-25 11:03:37 +00:00
1591891486
Merge "Add EthernetTestInterface to list of created interfaces"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-04-25 10:45:07 +00:00
79b38b491c
Merge "Test Ikev2VpnProfile provisioned with IkeTunnelConnectionParams" am: 2e670756ac am: 9942af20c0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063922

Change-Id: I966e6dac28759075313774966039097ff033d686
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-04-25 09:31:52 +00:00
fe35305b32
Merge "Test Ikev2VpnProfile provisioned with IkeTunnelConnectionParams" am: 2e670756ac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063922

Change-Id: I7c324a9abdf0f878e3dda99c28bd4a22cebd4d93
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-04-25 09:08:43 +00:00
9942af20c0
Merge "Test Ikev2VpnProfile provisioned with IkeTunnelConnectionParams"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-04-25 08:44:45 +00:00
2e670756ac
Merge "Remove NetworkPermissionConfig package" into tm-dev
Motomu Utsumi   authored and   Android (Google) Code Review   commited 2022-04-25 04:05:19 +00:00
9d874af3f2
improve mts bpf_existence_test to cover netd/clatd maps and programs in new location am: e9d5ad0b88 am: 89092d5798
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2073978

Change-Id: I5d25eb505b736f8c6bc9156f26f2cb7723f1b33d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-24 08:58:14 +00:00
81b51dd582
improve mts bpf_existence_test to cover netd/clatd maps and programs in new location am: e9d5ad0b88
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2073978

Change-Id: I0e8465cbd416221b277e44d28c5dd67a3d0ab77d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-24 08:17:31 +00:00
89092d5798
improve mts bpf_existence_test to cover netd/clatd maps and programs in new location
Test: TreeHugger, test bpf_existence_test
Bug: 218408035
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2b183e66d0c4c8750873ae7f0a30b9809e2c8295

Maciej Żenczykowski   commited 2022-04-23 09:20:29 -07:00
e9d5ad0b88
adjust for new T bpfloader net_shared location am: 0736d7bd91 am: 96706b661f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2071008

Change-Id: Iba57cbfe6f3c41fc7c396098f0caa662d68b1e0e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-23 09:56:33 +00:00
4249b8be1d
adjust for new T bpfloader net_shared location am: 0736d7bd91
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2071008

Change-Id: I2adb6923269eb15db881a3adb87ea46841df391e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-23 09:36:16 +00:00
96706b661f
adjust for new T bpfloader net_shared location
(this is safe because on pre-T none of these maps and programs are mainlined
 and thus safe to access from mainline code anyway)

Test: TreeHugger, manual
Bug: 218408035
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I23e565d665247f33e084978890a1ee8ffe0fe568

Maciej Żenczykowski   commited 2022-04-23 09:03:06 +00:00
0736d7bd91
Remove NetworkPermissionConfig package
Move declaration of MAINLINE_NETWORK_STACK permission from the
NetworkPermissionConfig package to the NetworkStack package.

Bug: 223649084
Test: m
Ignore-AOSP-First: changes in topics contains internal-only projects
Change-Id: I7d0565d366892f18dfc510ccbbdbf1eab6f1932a

Motomu Utsumi   commited 2022-04-23 04:35:24 +00:00
f2bf0335cd
Merge "Add a method to create a TAP interface with a given interface name." am: 7d7e7cd1fe am: 3c78a24a9a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059333

Change-Id: I02068707effdb1f3308c4b1997c0ece8bdb21f28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Xiao Ma   authored and   Automerger Merge Worker   commited 2022-04-22 13:40:03 +00:00
a456b23ad5
Merge "Add a method to create a TAP interface with a given interface name." am: 7d7e7cd1fe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059333

Change-Id: Id882dfb9510ddc794719e9b3860d0d98ef09f41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Xiao Ma   authored and   Automerger Merge Worker   commited 2022-04-22 13:24:59 +00:00
3c78a24a9a
Merge "Add a method to create a TAP interface with a given interface name."
Xiao Ma   authored and   Gerrit Code Review   commited 2022-04-22 13:10:19 +00:00
7d7e7cd1fe
Merge "Remove UserId from UID when checking against BLUETOOTH_UID" am: 64ac247056 am: e2a68b9829
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065564

Change-Id: Ic7542b64306a1a944877a1b381c4984d2dfd1296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-04-22 07:48:47 +00:00
1b6aa95ba4
Merge "Remove UserId from UID when checking against BLUETOOTH_UID" am: 64ac247056
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065564

Change-Id: If861cf6c2590d28811c46f7e33d5bc5ad73e772a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-04-22 07:20:21 +00:00
e2a68b9829
Merge "Remove UserId from UID when checking against BLUETOOTH_UID"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-04-22 06:51:41 +00:00
64ac247056
Merge "Update TEST_MAPPING file." am: 8300421bc5 am: 7f71dfabd0 am: e02db14f42
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266

Change-Id: Ifab0a966a494f6946c53cc2b6ce2cb01651ab384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-04-21 18:39:00 +00:00
49f697725e
Merge "Update TEST_MAPPING file." am: 8300421bc5 am: 7f71dfabd0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266

Change-Id: I62afff337b267c55f4e1a8cf75cd74dec0c62ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-04-21 18:24:28 +00:00
e02db14f42
Merge "Update TEST_MAPPING file." am: 8300421bc5 am: fa4f870706
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266

Change-Id: Id97414ab712cd4a7a0fcc9d7404bc2e9f78224c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-04-21 18:24:27 +00:00
237caa4170
Merge "Update TEST_MAPPING file." am: 8300421bc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266

Change-Id: I1e216217370bee0f12a824bece1ac49d1a62e526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-04-21 17:51:58 +00:00
fa4f870706
Merge "Update TEST_MAPPING file." am: 8300421bc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266

Change-Id: Id8d2cb2bea50e724c75b7a68eb3449486907b639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-04-21 17:50:56 +00:00
7f71dfabd0
Merge "Update TEST_MAPPING file."
Sudheer Shanka   authored and   Gerrit Code Review   commited 2022-04-21 17:27:38 +00:00
8300421bc5
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38 am: c028d38b97 am: 26de26d01c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099

Change-Id: I2f34f0485d483c91cc1b23d7e04d1a455c5a7ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-21 14:48:18 +00:00
a3e6059315
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150 am: 48ea1de25a am: c0224c038c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

Change-Id: Ic406a81b04b3f9301713cc0e376668041a1b956a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:48:07 +00:00
f1657f9e7c
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38 am: 8d75a93995
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099

Change-Id: I3878e5359349d8195e8741ea69ae437edab68909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-21 14:34:12 +00:00
2fadc5413c
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38 am: c028d38b97
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099

Change-Id: If92f66988299f547e14ef80442597ed2f7eb5bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-21 14:27:29 +00:00
26de26d01c
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150 am: 48ea1de25a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

Change-Id: I731881528f4891cf5d34bdd1da7b377470eb785f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:27:15 +00:00
c0224c038c
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150 am: 4ba3a8a6fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

Change-Id: I3b84544de9942b14bc2e2eb6d80c7eddc7edb916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:27:04 +00:00
c83fee7adb
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099

Change-Id: I4de5e5b28ce961bcf84f03210585de8dbaefd256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-21 14:04:40 +00:00
8d75a93995
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

Change-Id: Ic9aca26e0b4dafedd3d9134ad80ec19fc887ad1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:04:25 +00:00
4ba3a8a6fb
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099

Change-Id: I2d4a2a5cd07ab4a0bbf5839d7e749e8b0a0dca6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-21 14:04:05 +00:00
c028d38b97
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

Change-Id: Ibdf936ef58d84b87f726be02684b6ef1717065b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:03:34 +00:00
48ea1de25a
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-04-21 14:00:23 +00:00
b4bf6cea38
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf am: 8a48719452 am: d4a766fc16
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731

Change-Id: I23ea36149da031bc935a4336effdfb444cdb48b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 13:48:54 +00:00
f928510cab
Merge "[Tetheirng] Refactor carrier config to EntitlementManager"
Tom Hsu   authored and   Gerrit Code Review   commited 2022-04-21 13:43:14 +00:00
1135676150
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf am: 8a48719452
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731

Change-Id: I30ce0545947ed99c9f31b801d514c4864eb201c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 13:33:56 +00:00
d4a766fc16
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf am: bb015ef2af
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731

Change-Id: I9aa9ec8377a4fefc687a1282168ed1cb6e47277e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 13:33:54 +00:00
90d41149b3
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731

Change-Id: If61c289b6b66521cb8ca6df442697904f25cd7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 13:09:47 +00:00
bb015ef2af
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731

Change-Id: Ied8c9709cc7b48d74967c03f84e38d0af9f54d65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 13:09:06 +00:00
8a48719452
Merge "[SettingsProvider] fix connectivity test"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-04-21 12:41:49 +00:00
5e64a14ccf