Commit Graph

92672 Commits

Author SHA1 Message Date
Jean Chalard
3f48f42cb9 Merge "Fix a socket leak" into main 2023-09-26 02:57:25 +00:00
Treehugger Robot
fa03800d1e Merge changes I1731e65e,I2df84427 into main am: f411c02294
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2405722

Change-Id: I1ae06341d1422c65ac846cf1f3abe16c29a0e079
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 23:40:51 +00:00
Treehugger Robot
a91e8c6a04 Merge changes I1731e65e,I2df84427 into main am: f411c02294
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2405722

Change-Id: Id0335f2a9712cbf2df1f4a5b98c1a2b78787c828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 23:37:10 +00:00
Treehugger Robot
f411c02294 Merge changes I1731e65e,I2df84427 into main
* changes:
  Factorize CarrierPrivilegeAuthenticator constructors
  Change mCarrierServiceUid from int[] to SparseIntArray
2023-09-25 22:52:11 +00:00
Bill Yi
9ee2fe78da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c739ccd53 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3092584fc12d97ed5cb3f1acac7c0262627fb12e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 20:53:13 +00:00
Bill Yi
a41987b787 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-09-25 20:02:48 +00:00
Chalard Jean
90050b2528 Fix a socket leak
Test: manual :
      adb root
      adb shell lsof | grep system_ | grep IPv
      adb shell dumpsys connectivity --diag
      adb shell lsof | grep system_ | grep IPv
      Before the change : plenty of new open FDs
      After the change : no new FD
Bug: 297483305
Change-Id: I1c1fb8de44e50998e99af8b3aac3f77edce903e0
2023-09-25 20:37:03 +09:00
Chalard Jean
2186945466 Factorize CarrierPrivilegeAuthenticator constructors
Test: FrameworksNetTests
Change-Id: I1731e65ef09cb32b51ac9cc7884a9737c19ecce9
2023-09-25 19:05:05 +09:00
Chalard Jean
dfee6bec1a Change mCarrierServiceUid from int[] to SparseIntArray
Because followup changes will stop using synchronous getters
for getting the service package UIDs, it will be a lot more
convenient if this array is automatically sized.

Test: FrameworksNetTests
Bug: 236669534
Change-Id: I2df8442727b5f17bd2d4e55a8795dc9210beb74b
2023-09-25 19:05:05 +09:00
Chalard Jean
073606fc8d Add more necessary infra to CSTest
- Ability to mock enabled changes, which is necessary for
  requestNetwork
- Ability to disconnect an agent

Test: in aosp/2761506
Change-Id: If2701f1fff29453e74a4b388758c6ee3a16a5734
2023-09-25 14:56:09 +09:00
Treehugger Robot
b3cd72c8f0 Merge "[nearby][clean up] Remove useless legacy code" into udc-mainline-prod 2023-09-22 23:13:49 +00:00
Ryan Zuklie
4432fcced0 Merge changes Ic69fc75e,I6373d251 into main am: 8a88d85145
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2749654

Change-Id: I2ca42d703f1bcf15b57440a0552d06b0814e0a7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 20:50:27 +00:00
Ryan Zuklie
31f7fd8546 Merge changes Ic69fc75e,I6373d251 into main am: 8a88d85145
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2749654

Change-Id: I647baa696ac6e0f99aacb5de35148ad74f5a5498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 20:50:11 +00:00
Ryan Zuklie
8a88d85145 Merge changes Ic69fc75e,I6373d251 into main
* changes:
  Add ICMP type/code and udplite/sctp in Nettrace.
  Make BundleKey a distinct struct from PacketTrace.
2023-09-22 19:38:59 +00:00
Treehugger Robot
c86f5da706 Merge "use different log.h header file" into main am: 1b0f6fe058
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2759769

Change-Id: I971112a143a574d593d7a2a63b1926d448b0eeac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 04:35:15 +00:00
Treehugger Robot
a75b433c18 Merge "use different log.h header file" into main am: 1b0f6fe058
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2759769

Change-Id: I6782f2d5fea685c586c77f4717bc98383e074d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 04:35:12 +00:00
Treehugger Robot
1b0f6fe058 Merge "use different log.h header file" into main 2023-09-22 04:11:47 +00:00
Igor Zaslavsky
e336586353 Park RemoteAuth Manager and Service
Limit the amount of parked code built into Connectivity module

Test: built successfully.
Bug: 300522527
Change-Id: I87d7516011c469aa89fc7e67cf03c4ee8aa1bb9b
2023-09-22 04:09:02 +00:00
Bill Yi
9b9d0382e2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idfc3cbd85f9254916959275e2acaf8390321fae1
2023-09-21 21:05:19 -07:00
Bill Yi
8c739ccd53 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1cf57805a9a7c0d159ef5961cef91c7bca809ba3
2023-09-21 21:00:32 -07:00
Jean Chalard
7b803e68c8 Merge changes I8843ce7c,I90566998 into main am: 487191dbe6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2747260

Change-Id: Id79dec22a90513c68716de5cb6d0ec110a20dd00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 02:51:11 +00:00
Jin Chen
3ec94c211e Merge "[remoteauth] Clean up unused deps" into main am: 10f59a248c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2757186

Change-Id: I92aabeedf970c655a2598ff4ded65e1b15dc3257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 02:49:59 +00:00
Jean Chalard
1c4fa8d841 Merge changes I8843ce7c,I90566998 into main am: 487191dbe6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2747260

Change-Id: Ie28b77401438b9b230ccf61ea62774e5a0cc50f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 02:47:16 +00:00
Jin Chen
7fc87120dc Merge "[remoteauth] Clean up unused deps" into main am: 10f59a248c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2757186

Change-Id: I3f4675bc4405039946c9dd15ac4f96ee426e23f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 02:47:04 +00:00
Jean Chalard
487191dbe6 Merge changes I8843ce7c,I90566998 into main
* changes:
  Block the package updater while CTS are running
  Add a command to block networking for an app
2023-09-22 02:26:19 +00:00
Jin Chen
10f59a248c Merge "[remoteauth] Clean up unused deps" into main 2023-09-22 02:18:36 +00:00
Ryan Zuklie
e72b48416c Add ICMP type/code and udplite/sctp in Nettrace.
This adds support for additional protocols and also provides more clear
semantics of protocol specific fields, such as only including tcpFlags
when the protocol is IPPROTO_TCP.

Test: atest libnetworkstats_test & flash and trace
Change-Id: Ic69fc75e85ebf8734027c942a253af4972ad14d8
2023-09-21 15:14:07 -07:00
Ryan Zuklie
1733d3e6be Make BundleKey a distinct struct from PacketTrace.
This change refactors BundleKey to be a separate struct. This allows
us to do the conversion (e.g. of sport/dport, or icmp fields in the
future) in the constructor and change types (use optionals) where it
is convenient to simplify the code.

This change also fixes a bunch of desigated initializer order warnings
in the test (fields should be declared in same order as defined).

Test: atest libnetworkstats_test
Change-Id: I6373d2512280e93c54395fde38dcff43705b449e
2023-09-21 15:14:07 -07:00
Maciej Żenczykowski
601d9f8b65 use different log.h header file
Test: TreeHugger
Bug: 299653233
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1e5c7bfc86d2ad61c0bad3b5ef2add94b4ce1481
2023-09-21 22:11:43 +00:00
Maciej Żenczykowski
ae89d76a00 Merge "[Refactor] Make uid owner match comparison logic into a function" into main am: 3897aaf7e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2754265

Change-Id: I0485dc0469bde2ee3a06460cf3ea4073f084dd35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 11:29:28 +00:00
Maciej Żenczykowski
d2229688a9 Merge "[Refactor] Make uid owner match comparison logic into a function" into main am: 3897aaf7e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2754265

Change-Id: I75a3080ca4a815deb4d38a35c4ce5c1d2d22ca18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 11:29:12 +00:00
Maciej Żenczykowski
3897aaf7e9 Merge "[Refactor] Make uid owner match comparison logic into a function" into main 2023-09-21 10:21:52 +00:00
Chalard Jean
3a6544fb1f Block the package updater while CTS are running
Test: manual
Bug: 284534251
Change-Id: I8843ce7c9e14cfe3f6f3439405d519587f2656ef
2023-09-21 12:57:10 +09:00
Chalard Jean
c8fefb36d8 Add a command to block networking for an app
Test: Manual
Bug: 284534251
Change-Id: I90566998501c215de350965e3bffcd852d487bfe
2023-09-21 12:57:08 +09:00
Jin Chen
5be6652302 Merge "[remoteauth] Implement UwbRangingSession" into main am: 462572b24b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2726504

Change-Id: Icb66b94c50190ce89c09072bed3fc958ef9aacb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 02:33:48 +00:00
Jin Chen
2ff9c564eb Merge "[remoteauth] Implement UwbRangingSession" into main am: 462572b24b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2726504

Change-Id: Ia221c3ed70ea47600433dd9490a7de7b4e134f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 01:40:35 +00:00
Jin Chen
462572b24b Merge "[remoteauth] Implement UwbRangingSession" into main 2023-09-21 01:18:17 +00:00
Xinyi Zhou
d671163a9a [nearby][clean up] Remove useless legacy code
This was used back when Bluetooth 4.2 was used. We should remove the
empty code here.

Test: -m
Ignore-AOSP-First: nearby not in aosp yet
Change-Id: I0ea54f77c66c01f02fbee9eb1e782a3a9ade6566
2023-09-20 17:11:34 -07:00
Jin Chen
c54521ba85 [remoteauth] Implement UwbRangingSession
Test: atest RemoteAuthUnitTests
Bug: 290675814
Change-Id: I9a38298092607fe87bc7a8b157ff9d44d84fa55a
2023-09-20 15:33:48 -07:00
Maciej Żenczykowski
195b449b3b Merge "bump min_sdk_version from 29 (Q) to 30 (R)" into main am: a828357fe1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2755673

Change-Id: Ic4dd0a330529bc5b16cbabcfbc846452db79caf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:37:34 +00:00
Maciej Żenczykowski
997ff58786 Merge "bump min_sdk_version from 29 (Q) to 30 (R)" into main am: a828357fe1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2755673

Change-Id: Iad32c375b9a29ce14726d9d52ea06f1c200e6c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:37:18 +00:00
Maciej Żenczykowski
a828357fe1 Merge "bump min_sdk_version from 29 (Q) to 30 (R)" into main 2023-09-20 17:01:40 +00:00
Treehugger Robot
86068e7cc9 Merge "Add test for partial responses" into main am: d292cff70e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2437173

Change-Id: I897778a3197f83a2ce833ca64169a4450a303959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 09:37:10 +00:00
Treehugger Robot
4741c6eba8 Merge "Add test for partial responses" into main am: d292cff70e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2437173

Change-Id: I5f68885adf0083c3cea1de67fd5ce95749246915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 09:36:54 +00:00
Treehugger Robot
d292cff70e Merge "Add test for partial responses" into main 2023-09-20 09:07:15 +00:00
Mark Chien
6ab29917b4 Merge "SyncSM04: implement processMessage function" into main am: 35f19e74a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2301482

Change-Id: Ib8468e83da956ee4a6c191baad8be13db51813b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 03:23:52 +00:00
Mark Chien
b23b655bff Merge "SyncSM04: implement processMessage function" into main am: 35f19e74a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2301482

Change-Id: I2dfff2c5a390a603c2f91637c404b7248c664ad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 03:23:45 +00:00
Mark Chien
35f19e74a9 Merge "SyncSM04: implement processMessage function" into main 2023-09-20 02:36:05 +00:00
Jin Chen
f86048224e [remoteauth] Clean up unused deps
Fix: 301051105
Test: build
Change-Id: I23dfab79503db2fe34ffd06bf48d54961c0bc424
2023-09-19 18:04:24 -07:00
Maciej Żenczykowski
127a1441c3 bump min_sdk_version from 29 (Q) to 30 (R)
Mainline no longer supports Q.
These files were recently moved into p/m/C as part of a refactor.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0f06ace921db6c79d63c0048bdb73d167ff606cf
2023-09-19 23:22:58 +00:00