Commits · 73eadb57b9ab447cdff1708a6d09cdeb13579547 · LMODroid / platform_packages_modules_Connectivity

Dec 11, 2023

[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 "[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

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

Fix BpfLoaderRcUtils to support IOS_8859_1 · 71a65dc2
Yuyang Huang authored 1 year ago
```
Test: TH
Change-Id: Ic53e903f7a971c92793e3360a5d3f53c97c0503b
```
71a65dc2

[BR14] Tracker Data Saver status in ConnectivityService · 38c7503a

Junyu Lai authored 1 year ago

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

38c7503a

Merge "[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage... · c555dc32

Nate Jiang authored 1 year ago

Merge "[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest" into main am: bccd95fa

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>

c555dc32

Merge "[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage... · 10b7ecec

Nate Jiang authored 1 year ago

Merge "[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest" into main am: bccd95fa

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

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

10b7ecec

Merge "[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest" into main · bccd95fa
Nate Jiang authored 1 year ago

bccd95fa

Merge "Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main am: · 95114398

Chiachang Wang authored 1 year ago

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>

95114398

Merge "Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main am: · 260c7e03

Chiachang Wang authored 1 year ago

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

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

260c7e03

Merge "Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main · 3049df0e
Chiachang Wang authored 1 year ago

3049df0e

Reference DataSaver setting from BPF map on V+ only · 9e1865e4

Ken Chen authored 1 year ago

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

9e1865e4

Use flags.aconfig in platform for android networking · 31abe92c

Motomu Utsumi authored 1 year ago

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

31abe92c