Commits · 38b61943c7181afc2cdbee9cd59b0a96e5691592 · LMODroid / platform_packages_modules_Connectivity

Dec 12, 2023

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

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

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

Dec 08, 2023

[nearby] Returns error code for startBroadcast if there is an existing broadcast · 8fff1dbd

Xinyi Zhou authored 1 year ago

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

8fff1dbd

[nearby] Update README · b1efe80d

Xinyi Zhou authored 1 year ago

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

b1efe80d

[nearby] Unregister broadcast listener in death · 743ca81c

Xinyi Zhou authored 1 year ago

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

743ca81c

[nearby] Add CredentialElement class · 8cd2e81d

Xinyi Zhou authored 1 year ago

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

8cd2e81d

[nearby][framework] Sync DataElement value with spec · 947c01dd

Xinyi Zhou authored 1 year ago

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

947c01dd

Fix NearbyConfigurationTest. · c3c807b5

Chen Wang authored 1 year ago

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

c3c807b5

Catches illegal argument exception thrown by LE advertiser · a60ebedf

Jayden Kim authored 1 year ago

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

a60ebedf

Removes duplicated filter setting · 4ae120de

Jayden Kim authored 1 year ago

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

4ae120de

Merge Android 14 QPR1 · 373b03fb

Xin Li authored 1 year ago

Merged-In: I08c79f7266116cfe8d6b0ed42a6f026547660cbc
Bug: 315507370
Change-Id: Id924654831ef1b5024d4329477d497783165426b

373b03fb

Merge "Exclude user build devices for the test" into udc-mainline-prod · 1b16d6b8
Xinyi Zhou authored 1 year ago

1b16d6b8

Merge "Fix BpfLoaderRcUtils to support IOS_8859_1" into main am: · 1c2937d5

Maciej Żenczykowski authored 1 year ago

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>

1c2937d5

Merge "Fix BpfLoaderRcUtils to support IOS_8859_1" into main am: · 50df3df6

Maciej Żenczykowski authored 1 year ago

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

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

50df3df6

Merge "Fix BpfLoaderRcUtils to support IOS_8859_1" into main · 742c476d
Maciej Żenczykowski authored 1 year ago

742c476d

Merge "Get rid of any unnecessary reset calls" into main am: · 453d24ba

Mark Chien authored 1 year ago

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>

453d24ba

Merge "Get rid of any unnecessary reset calls" into main am: · bd975a9e

Mark Chien authored 1 year ago

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

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

bd975a9e

Merge "Get rid of any unnecessary reset calls" into main · ce6f1407
Mark Chien authored 1 year ago

ce6f1407

Exclude user build devices for the test · 523eeb3c

Xinyi Zhou authored 1 year ago

Fix: 313884732
Ignore-AOSP-First: nearby_not_in_aosp_yet
Test: -m
Change-Id: Iaaca422cb105c00ded1d84b40afd745abcd651b7

523eeb3c

Merge "Reference DataSaver setting from BPF map on V+ only" into main am: · 07f8eac8

Ken Chen authored 1 year ago

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>

07f8eac8

Merge "Reference DataSaver setting from BPF map on V+ only" into main am: · c3e2e0e0

Ken Chen authored 1 year ago

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

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

c3e2e0e0

Merge "Reference DataSaver setting from BPF map on V+ only" into main · 86b95d40
Ken Chen authored 1 year ago

86b95d40

Get rid of any unnecessary reset calls · 4d7b7ecd

Mark Chien authored 1 year ago

Calling resets at the beginning of setUp is unnecessary.

Bug: 315368147
Test: TH

Change-Id: I87030bc867d90752e745fd4a274581d1f3230f85

4d7b7ecd