Reland "Support getting transform state in IpSecService"
...
This reverts commit 69eb8325c0
Yan Yan
authored and
Gerrit Code Review
commited 2023-12-12 22:19:55 +00:00
84fc0ee2d6
Revert "Support getting transform state in IpSecService"
...
This reverts commit ab5006c17d
Yan Yan
authored and
Gerrit Code Review
commited 2023-12-12 21:53:46 +00:00
69eb8325c0
Support getting transform state in IpSecService
...
Bug: 308011229
Test: IpSecServiceParameterizedTest (new tests)
Change-Id: I3f1c2ef60ee9b6ac17909e0ee083ee6f8483588e
Yan Yan
commited 2023-12-12 00:14:13 +00:00
ab5006c17d
Merge changes from topic "cherrypicker-L94400030000731002:N23400030012047507" into main
...
* changes:
[nearby] Returns error code for startBroadcast if there is an existing broadcast
[nearby] Update README
[nearby] Unregister broadcast listener in death
[nearby] Add CredentialElement class
[nearby][framework] Sync DataElement value with spec
Fix NearbyConfigurationTest.
Catches illegal argument exception thrown by LE advertiser
Xinyi Zhou
authored and
Gerrit Code Review
commited 2023-12-11 23:47:47 +00:00
d7a9a654f7
Merge "[XFRM_MSG_NEWSA] Support polling SA state with netlink message" into main
Yan Yan
authored and
Gerrit Code Review
commited 2023-12-11 23:27:17 +00:00
96db51b377
Merge "Removes duplicated filter setting" into main
Xinyi Zhou
authored and
Gerrit Code Review
commited 2023-12-11 22:10:25 +00:00
6de7567646
[XFRM_MSG_NEWSA] Support polling SA state with netlink message
...
Bug: 308011229
Test: IpSecXfrmControllerTest
Change-Id: Id765cd8d8d7e330969877cb0890bd828417fb6b8
Yan Yan
commited 2023-12-11 18:43:34 +00:00
4df361975d
Merge "[BR14] Tracker Data Saver status in ConnectivityService" into main
Junyu Lai
authored and
Gerrit Code Review
commited 2023-12-11 10:09:57 +00:00
5ad399d8c3
Merge "Use flags.aconfig in platform for android networking" into main
Motomu Utsumi
authored and
Gerrit Code Review
commited 2023-12-10 12:28:35 +00:00
925258121c
[nearby] Returns error code for startBroadcast if there is an existing broadcast
...
Fix: 294461081
Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7b40aa36e8419e134c8171e22a7fa2a2d3bf85a7 )
Merged-In: Icc3227ec5aa7d0ea7d33b7100ef131928577b5a7
Change-Id: Icc3227ec5aa7d0ea7d33b7100ef131928577b5a7
Xinyi Zhou
authored and
Android Build Cherrypicker Worker
commited 2023-12-08 22:37:18 +00:00
8fff1dbd0d
[nearby] Update README
...
Test: n/a
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:99c18f649c9a2623c905f9cbfea04a2559756050 )
Merged-In: I0802e60f60170b3be686fa7b16aeb6a2571a7386
Change-Id: I0802e60f60170b3be686fa7b16aeb6a2571a7386
Xinyi Zhou
authored and
Android Build Cherrypicker Worker
commited 2023-12-08 22:37:13 +00:00
b1efe80d75
[nearby] Unregister broadcast listener in death
...
Fix: 280377682
Test: unit test
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:691adc8cdd1cca9077740ce06246ce347867d757 )
Merged-In: I1d632cb150ae30808cbf3343869534111e3dde12
Change-Id: I1d632cb150ae30808cbf3343869534111e3dde12
Xinyi Zhou
authored and
Android Build Cherrypicker Worker
commited 2023-12-08 22:37:07 +00:00
743ca81c30
[nearby] Add CredentialElement class
...
This class should extend DataElement ideally, but we cannot do this
since the DataElement class as System API is final.
Bug: 290294482
Test: unit test
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0e9e44c4f06c6ea58e991b695cb34dbc0c9d3b59 )
Merged-In: I2ec80b5975a8fb27edb5f92f134d6076738eaac8
Change-Id: I2ec80b5975a8fb27edb5f92f134d6076738eaac8
Xinyi Zhou
authored and
Android Build Cherrypicker Worker
commited 2023-12-08 22:37:03 +00:00
8cd2e81dfd
[nearby][framework] Sync DataElement value with spec
...
Note DataType in DataElement is used for internal implementation only.
We only keep those data element types used for encoding and decoding.
Please use the spec as the only source.
go/nearby-specs-working-doc
Bug: 234155151
Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8182ac22c14e044c5161483a9a96bf594c403e61 )
Merged-In: I71754e645742ca4fe20d346763796a1a5e5dae75
Change-Id: I71754e645742ca4fe20d346763796a1a5e5dae75
Xinyi Zhou
authored and
Android Build Cherrypicker Worker
commited 2023-12-08 22:36:58 +00:00
947c01ddc6
Fix NearbyConfigurationTest.
...
TestAppSupported Flag can be set to true only in user-debug devices.
Add conidtional testing for this test case.
Bug: 285234065
Ignore-AOSP-First: nearby_not_in_aosp_yet
Test: atest NearbyConfigurationTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:22b1e80835ec5bbacc7cb3bf88e072cfd8fcd8d9 )
Merged-In: I14a7947f8a9178a1f97b5ed392882ab9f200eb89
Change-Id: I14a7947f8a9178a1f97b5ed392882ab9f200eb89
Chen Wang
authored and
Android Build Cherrypicker Worker
commited 2023-12-08 22:36:53 +00:00
c3c807b54b
Catches illegal argument exception thrown by LE advertiser
...
Test: on device test
Ignore-AOSP-First: nearby_not_in_aosp_yet
Bug: 280387586
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b1c6f7f6de1826c004ddc4ca69eb77d7416b0660 )
Merged-In: Ie05ed9ff57743f0e91ec0571d5a99bebd55a56c8
Change-Id: Ie05ed9ff57743f0e91ec0571d5a99bebd55a56c8
Jayden Kim
authored and
Android Build Cherrypicker Worker
commited 2023-12-08 22:36:47 +00:00
a60ebedf58
Removes duplicated filter setting
...
Test: on device test
Ignore-AOSP-First: nearby_not_in_aosp_yet
Bug: 287538344
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7ed8dd6ac3479e19dd8c935bb356a2ecf2d7623f )
Merged-In: Idbf2918bae00b31ebb31f3f09590e32b4eb0ebc2
Change-Id: Idbf2918bae00b31ebb31f3f09590e32b4eb0ebc2
Jayden Kim
authored and
Android Build Cherrypicker Worker
commited 2023-12-08 22:31:42 +00:00
4ae120de04
Merge Android 14 QPR1
...
Merged-In: I08c79f7266116cfe8d6b0ed42a6f026547660cbc
Bug: 315507370
Change-Id: Id924654831ef1b5024d4329477d497783165426b
Xin Li
commited 2023-12-08 13:14:25 -08:00
373b03fbf3
Merge "Fix BpfLoaderRcUtils to support IOS_8859_1" into main am: 742c476d89
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2864287
Change-Id: I08c79f7266116cfe8d6b0ed42a6f026547660cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-12-08 12:08:20 +00:00
1c2937d51a
Merge "Fix BpfLoaderRcUtils to support IOS_8859_1" into main
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2023-12-08 11:38:55 +00:00
742c476d89
Merge "Get rid of any unnecessary reset calls" into main am: ce6f14073c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2865435
Change-Id: Ib49434f5b3d0a47ac29a33fdf09150d912815018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mark Chien
authored and
Automerger Merge Worker
commited 2023-12-08 08:15:44 +00:00
453d24ba82
Merge "Get rid of any unnecessary reset calls" into main
Mark Chien
authored and
Gerrit Code Review
commited 2023-12-08 07:48:14 +00:00
ce6f14073c
Merge "Reference DataSaver setting from BPF map on V+ only" into main am: 86b95d405e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861608
Change-Id: Ia1d888c88c48e50fcfab624fd28f75e847524a53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Ken Chen
authored and
Automerger Merge Worker
commited 2023-12-08 07:08:41 +00:00
07f8eac855
Merge "Reference DataSaver setting from BPF map on V+ only" into main
Ken Chen
authored and
Gerrit Code Review
commited 2023-12-08 06:43:54 +00:00
86b95d405e
Get rid of any unnecessary reset calls
...
Calling resets at the beginning of setUp is unnecessary.
Bug: 315368147
Test: TH
Change-Id: I87030bc867d90752e745fd4a274581d1f3230f85
Mark Chien
commited 2023-12-08 06:34:09 +00:00
4d7b7ecd7e
Fix BpfLoaderRcUtils to support IOS_8859_1
...
Test: TH
Change-Id: Ic53e903f7a971c92793e3360a5d3f53c97c0503b
Yuyang Huang
commited 2023-12-08 15:03:01 +09:00
71a65dc21b
[BR14] Tracker Data Saver status in ConnectivityService
...
BYPASS_INCLUSIVE_LANGUAGE_REASON=Using public API
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.CSBpfNetMapsTest
(on U and V devices respectively)
Bug: 297836825
Fix: 314858283
Change-Id: Ibeac8cd3a33468c6539234255328affc6b3f8ffe
Junyu Lai
commited 2023-12-08 13:54:29 +08:00
38c7503ab5
Merge "[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest" into main am: bccd95fab6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861373
Change-Id: I8fe3c0267864b09f0cabc337886cd304be477775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Nate Jiang
authored and
Automerger Merge Worker
commited 2023-12-08 03:36:42 +00:00
c555dc32d2
Merge "[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest" into main
Nate Jiang
authored and
Gerrit Code Review
commited 2023-12-08 03:24:51 +00:00
bccd95fab6
Merge "Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main am: 3049df0ee0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861585
Change-Id: Ic4b73222c3f1ffcbe51b80a847846e3b3e89f4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2023-12-08 03:20:56 +00:00
95114398a2
Merge "Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main
Chiachang Wang
authored and
Gerrit Code Review
commited 2023-12-08 03:00:17 +00:00
3049df0ee0
Reference DataSaver setting from BPF map on V+ only
...
Only reference DataSaverEnabled map on V+ platform because the
information in map before platform V is not time-precise. See comment in
this commit for detail.
Bug: 288340533
Test: presubmit
Change-Id: I0795e88e6006e6d24d27b63c31d0e3ed81d0262c
Ken Chen
commited 2023-12-08 02:42:51 +00:00
9e1865e48e
Use flags.aconfig in platform for android networking
...
flags.aconfig for android networking is under
packages/modules/Connectivity.
But, currently, mainline code should not read trunk stable flag.
To avoid confusion, this CL moves flags.aconfig to platform.
Bug: 315302281
Test: TH
Change-Id: I3a667cfa14d51e481bb4e99301c10319d2600e00
Merged-In: I44c111577643bacb35b532cb156a61d30cfea31a
Motomu Utsumi
commited 2023-12-08 11:42:35 +09:00
31abe92c36
Merge "[XFRM_MSG_NEWSA] Support xfrm_replay_state_esn and XFRM_MSG_NEWSA" into main am: b94bd28e33
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2833750
Change-Id: I979388a1b9c3ef13a891b2e29690bbb18a1b3fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yan Yan
authored and
Automerger Merge Worker
commited 2023-12-07 23:26:46 +00:00
04efefa318
Merge "[XFRM_MSG_NEWSA] Support xfrm_replay_state_esn and XFRM_MSG_NEWSA" into main
Yan Yan
authored and
Gerrit Code Review
commited 2023-12-07 22:55:48 +00:00
b94bd28e33
Add a flag for getIpSecTransformState and IpSecTransformState am: 318b1abbaf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2860825
Change-Id: Ie8f1689029815e5d18d199d729c807d7d0f2fa2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yan Yan
authored and
Automerger Merge Worker
commited 2023-12-07 21:16:39 +00:00
fb52aab66a
Add a flag for getIpSecTransformState and IpSecTransformState
...
Bug: 308011229
Test: make
Change-Id: Ib148b62b375f4f7b6a5d5ca82c74808bffa2e531
Yan Yan
commited 2023-12-07 18:47:24 +00:00
318b1abbaf
Merge "Support network slicing permission check in multi-user environment" into main am: 38f871c8e0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2849536
Change-Id: Ie0e57f2641fa4dd95be8e4f9b62233c97fc216bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2023-12-07 13:18:17 +00:00
14520f8be5
Merge "Support network slicing permission check in multi-user environment" into main
Treehugger Robot
authored and
Gerrit Code Review
commited 2023-12-07 12:32:18 +00:00
38f871c8e0
Replace MdnsPointerRecord contructor usage for queries am: 516e27f9c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2856947
Change-Id: Ia983305248f41ebefb040eba341ef6ff7eca7af1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2023-12-07 12:08:55 +00:00
24b91526c5
Replace MdnsPointerRecord contructor usage for queries
...
This is a test only change, replacing the MdnsPointerRecord
constructor usage for queries with the new version.
Bug: 312657709
Test: atest FrameworksNetTests
Change-Id: Ie9e51df78bfc27090503b861c5ac979201f10608
Paul Hu
commited 2023-12-07 08:38:48 +00:00
516e27f9c3
Update testAllowedUids to follow revert of canSeeAllowedUids am: 85cbe604df
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2862525
Change-Id: I66056a8e90f281280a90017e40620ccbd7461eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Motomu Utsumi
authored and
Automerger Merge Worker
commited 2023-12-07 05:17:01 +00:00
6ce6511453
Update testAllowedUids to follow revert of canSeeAllowedUids
...
aosp/2854709 reverted canSeeAllowedUids change done by aosp/2405720.
But aosp/2854709 did not update testAllowedUids and broke
testAllowedUids since cts can no longer see allowedUids.
This CL updates testAllowedUids to skip some test cases.
Followup CLs will allow ownerUid to see allowedUids again and re-enable
test cases.
Bug: 315112049
Test: TH
Change-Id: I1e4ca09ad15b6150182325cbfda1548e5fec79d1
Motomu Utsumi
commited 2023-12-07 11:59:34 +09:00
85cbe604df
Merge "Add a new PIO flag: DHCPv6-PD preferred flag." into main am: f75eacd3f5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861287
Change-Id: I277c22b3c378bad34a450f13646d10e8412aa9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Xiao Ma
authored and
Automerger Merge Worker
commited 2023-12-06 13:59:56 +00:00
2e9a823a4b
Merge "Add a new PIO flag: DHCPv6-PD preferred flag." into main
Xiao Ma
authored and
Gerrit Code Review
commited 2023-12-06 12:48:33 +00:00
f75eacd3f5
Merge "Revert canSeeAllowedUids for ownerUid" into main am: 6f95ab2558
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2854709
Change-Id: Iddb417f1f5125d804aad33363585fd3b479dafc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Motomu Utsumi
authored and
Automerger Merge Worker
commited 2023-12-06 07:21:26 +00:00
83bf6759a8
Merge "Revert canSeeAllowedUids for ownerUid" into main
Motomu Utsumi
authored and
Gerrit Code Review
commited 2023-12-06 05:53:00 +00:00
6f95ab2558
Add a new PIO flag: DHCPv6-PD preferred flag.
...
The new P flag is defined in
https://datatracker.ietf.org/doc/draft-ietf-6man-pio-pflag/ .
Bug: 315069348
Test: TH
Change-Id: Ie386cc8b9fbe136333b46c73da785e02983a582b
Xiao Ma
commited 2023-12-06 13:41:07 +09:00
594e34f09a
[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest
...
This test require latest Connectivity module
Bug: 314392808
Test: mts-tradefed run mts-wifi
Change-Id: I283ffe9b20af957818584cddfb0d188a5a8625a7
Nate Jiang
commited 2023-12-06 03:56:44 +00:00
14f557181b
Merge "[AF01] Move NetworkStatsCollection comparison code to NetworkStatsCollection" into main am: 2f67e0f2d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2859025
Change-Id: I407d4ce42ad57710cf5705bbdd216fe5efb93bd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Junyu Lai
authored and
Automerger Merge Worker
commited 2023-12-06 02:58:58 +00:00
e3d0f99fd0
Yan Yan
authored and
Gerrit Code Review
commited 
Xinyi Zhou
authored and
Junyu Lai
authored and
Motomu Utsumi
authored and
Android Build Cherrypicker Worker
commited 
Chen Wang
authored and
Jayden Kim
authored and
Xin Li
commited 
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 
Mark Chien
authored and
Ken Chen
authored and
Yuyang Huang
commited 
Nate Jiang
authored and
Chiachang Wang
authored and
Treehugger Robot
authored and
Paul Hu
authored and
Xiao Ma
authored and