Commits · ae48dfeff1db26327511ee093812540d29788569 · LMODroid / platform_packages_modules_Connectivity

Dec 13, 2023

Merge changes from topic "ipsec-tramsform-state" into main am: · ae48dfef

Yan Yan authored 1 year ago

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

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

ae48dfef

Merge changes from topic "ipsec-tramsform-state" into main · 07e425cd

Yan Yan authored 1 year ago

* changes:
  Expose APIs to query the state of an IpSecTransform
  Reland "Support getting transform state in IpSecService"

07e425cd

Merge "Don't add LOCAL_NETWORK as forbidden capability" into main am: · bf34b52b

Lorenzo Colitti authored 1 year ago

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

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

bf34b52b

Merge "Don't add LOCAL_NETWORK as forbidden capability" into main · 9efc4299
Lorenzo Colitti authored 1 year ago

9efc4299

Don't add LOCAL_NETWORK as forbidden capability · 22941b38

Lorenzo Colitti authored 1 year ago

This causes the module to crash on rollback because the current
production code does not consider LOCAL_NETWORK to be a valid
capability.

Change-Id: Idf57d72c384b41b483098c4c302738072ebf7f90
Test: TH
Fix: 313030307

22941b38

Dec 12, 2023

Merge "Revert "Support getting transform state in IpSecService"" into main am: · e08aa268

Yan Yan authored 1 year ago

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

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

e08aa268

Expose APIs to query the state of an IpSecTransform · 3976e49e
Yan Yan authored 1 year ago
```
Bug: 308011229
Test: make update-api
Change-Id: I5ca6278305f814dbce6a7c41a4f4e491b1389b31
```
3976e49e

Reland "Support getting transform state in IpSecService" · 84fc0ee2

Yan Yan authored 1 year ago

This reverts commit 69eb8325.

Bug: 308011229
Change-Id: I4dd68bdedc0088860895a833f2b4cb8e1845429a
Test: IpSecServiceParameterizedTest (new tests)

84fc0ee2

Merge "Revert "Support getting transform state in IpSecService"" into main · bf96d948
Yan Yan authored 1 year ago

bf96d948

Revert "Support getting transform state in IpSecService" · 69eb8325

Yan Yan authored 1 year ago

This reverts commit ab5006c1.

Reason for revert: b/316010034 breaking VCN unit tests

Change-Id: I68cb1a99bb6e492c16901972d201761cd00df6fa

69eb8325

[automerger skipped] Merge changes from topic "v1_impl_cherrypick" into main am: -s ours · c3019409

Xinyi Zhou authored 1 year ago

am skip reason: Merged-In Ie50d3fae62af6f637583216e3dae5841c1214aa3 with SHA-1 17a0803d is already in history

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

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

c3019409

[automerger skipped] [nearby] Update encoding and decoding according to the... · fe0d495d

Xinyi Zhou authored 1 year ago

[automerger skipped] [nearby] Update encoding and decoding according to the spec am: bcf305cb -s ours

am skip reason: Merged-In Ie50d3fae62af6f637583216e3dae5841c1214aa3 with SHA-1 17a0803d is already in history

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



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

fe0d495d

Merge changes from topic "v1_impl_cherrypick" into main · 7a2152a0

Xinyi Zhou authored 1 year ago

* changes:
  [nearby] Update encoding and decoding according to the spec
  [nearby] Update encryption methods according to the spec

7a2152a0

Merge "Support getting transform state in IpSecService" into main am: · ecb6caf7

Yan Yan authored 1 year ago

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

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

ecb6caf7

Merge "Support getting transform state in IpSecService" into main · abf9dceb
Yan Yan authored 1 year ago

abf9dceb

Merge changes I395560fb,If6abc33c into main am: · 7e0d608b

Yang Sun authored 1 year ago

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

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

7e0d608b

Merge changes I395560fb,If6abc33c into main · 336f3c10

Yang Sun authored 1 year ago

* changes:
  Add support for NLM_F_DUMP request in StructNLMsgHdr
  Mark NetworkStaticLibTestsLib as test for lint

336f3c10

Add more timeout for verify the interaction of the mock object am: · 38b61943

Chiachang Wang authored 1 year ago

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

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

38b61943

Add more timeout for verify the interaction of the mock object · d0535553

Chiachang Wang authored 1 year ago

The verification happened earlier than the interaction with
production code. This may happen in low performance devices,
e.g. cuttlefish. Add timeout for the verification to deflake
the test.

Bug: 313828402
Test: atest FrameworksNetTests
Change-Id: I1ffa7e7573d503eb0396aa211a90ba032175b3a1

d0535553

Merge "Add experiment flag for tethering refactor" into main am: · fbb4e374

Mark Chien authored 1 year ago

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

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

fbb4e374

Merge "Add experiment flag for tethering refactor" into main · dbae5744
Mark Chien authored 1 year ago

dbae5744

Add experiment flag for tethering refactor · cf11be9e

Mark authored 1 year ago

The logic is currently disabled by default, adding a flag so
that we can compare result with A/B rollout.

Test: atest TetheringTests
Change-Id: If640b9a172b97aa67c49b2976cdef118218f1e0f

cf11be9e

[nearby] Update encoding and decoding according to the spec · bcf305cb

Xinyi Zhou authored 1 year ago

Test: w/ MainlineTestApp
Fix: 290294482
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/17a0803df0c82377ed4afda50c24d59b4a814002)
Merged-In: Ie50d3fae62af6f637583216e3dae5841c1214aa3
Change-Id: Ie50d3fae62af6f637583216e3dae5841c1214aa3

bcf305cb

[nearby] Update encryption methods according to the spec · f31eccbd

Xinyi Zhou authored 1 year ago

Test: -m
Fix: 290294425
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:297c193dede82ca662a708bb7f3eeb90ce9e968b)
Merged-In: I24ead1adfd0928a877fa1441501c3b6e462bdbd6
Change-Id: I24ead1adfd0928a877fa1441501c3b6e462bdbd6

f31eccbd

Support getting transform state in IpSecService · ab5006c1

Yan Yan authored 1 year ago

Bug: 308011229
Test: IpSecServiceParameterizedTest (new tests)
Change-Id: I3f1c2ef60ee9b6ac17909e0ee083ee6f8483588e

ab5006c1

Dec 11, 2023

[automerger skipped] Merge changes from topic... · 49209189

Xinyi Zhou authored 1 year ago

[automerger skipped] Merge changes from topic "cherrypicker-L94400030000731002:N23400030012047507" into main am: d7a9a654 -s ours

am skip reason: Merged-In Icc3227ec5aa7d0ea7d33b7100ef131928577b5a7 with SHA-1 7b40aa36 is already in history

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



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

49209189

[automerger skipped] [nearby] Returns error code for startBroadcast if there... · c617bbf1

Xinyi Zhou authored 1 year ago

[automerger skipped] [nearby] Returns error code for startBroadcast if there is an existing broadcast am: 8fff1dbd -s ours

am skip reason: Merged-In Icc3227ec5aa7d0ea7d33b7100ef131928577b5a7 with SHA-1 7b40aa36 is already in history

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



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

c617bbf1

Merge "[XFRM_MSG_NEWSA] Support polling SA state with netlink message" into main am: · be098d64

Yan Yan authored 1 year ago

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

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

be098d64

Merge changes from topic "cherrypicker-L94400030000731002:N23400030012047507" into main · d7a9a654

Xinyi Zhou authored 1 year ago

* 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

d7a9a654

Merge "[XFRM_MSG_NEWSA] Support polling SA state with netlink message" into main · 96db51b3
Yan Yan authored 1 year ago

96db51b3

[automerger skipped] Merge "Removes duplicated filter setting" into main am: -s ours · 0427eb1e

Xinyi Zhou authored 1 year ago

am skip reason: Merged-In Idbf2918bae00b31ebb31f3f09590e32b4eb0ebc2 with SHA-1 e6195f3d is already in history

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

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

0427eb1e

[automerger skipped] Removes duplicated filter setting am: -s ours · 73eadb57

Jayden Kim authored 1 year ago

am skip reason: Merged-In Idbf2918bae00b31ebb31f3f09590e32b4eb0ebc2 with SHA-1 e6195f3d is already in history

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

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

73eadb57

Merge "[BR14] Tracker Data Saver status in ConnectivityService" into main am: · 9e48252d

Junyu Lai authored 1 year ago

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

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

9e48252d

Merge "Use flags.aconfig in platform for android networking" into main am: · 8157e745

Motomu Utsumi authored 1 year ago

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

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

8157e745

Merge "Removes duplicated filter setting" into main · 6de75676
Xinyi Zhou authored 1 year ago

6de75676
[XFRM_MSG_NEWSA] Support polling SA state with netlink message · 4df36197
Yan Yan authored 1 year ago
```
Bug: 308011229
Test: IpSecXfrmControllerTest
Change-Id: Id765cd8d8d7e330969877cb0890bd828417fb6b8
```
4df36197
Merge "[BR14] Tracker Data Saver status in ConnectivityService" into main · 5ad399d8
Junyu Lai authored 1 year ago

5ad399d8

Dec 10, 2023
- Merge "Use flags.aconfig in platform for android networking" into main · 92525812
  Motomu Utsumi authored 1 year ago
  
  92525812
Dec 09, 2023

Add support for NLM_F_DUMP request in StructNLMsgHdr · 9ea3be13

Yang Sun authored 1 year ago

Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.StructNlMsgHdrTest
Change-Id: I395560fb1edfb1c806b2ed4c74a7a3081c7b2515

9ea3be13

Merge Android 14 QPR1 am: · 89a2b2f9

Xin Li authored 1 year ago

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

Merged-In: I08c79f7266116cfe8d6b0ed42a6f026547660cbc
Merged-In: Id924654831ef1b5024d4329477d497783165426b
Change-Id: Iaab89fe854482698387c5e39b175f3b9969ae019

89a2b2f9