Commit Graph

928 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
27ad67e3f6 Do not build remoteauth in udc branches
Remotauth is not compatible with U, so building it in udc-based branches
is not necessary, and it would be hard to backport dependencies as
needed.

This change causes fallback sources to be built instead of
remoteauth/service and remoteauth/framework: stubs should only be needed
for entry points into the module, so the stubs should not need to be
modified often.

The remoteauth sources are still used for generating the API (as per
api_srcs in framework-connectivity-t), to avoid merge conflicts in the
API .txt files. But the implementation jar actually used on device or
shipped via module updates does not contain the API classes. In practice
this means that API stubs are generated through metalava from the
remoteauth sources, and these need to be built. So the API surface
itself cannot depend on V+ classes (APIs cannot take V+ classes as
arguments or return them). This is the case anyway, as
framework-connectivity-t is on the bootclasspath on T+; and in general,
module bootclasspath jars need to avoid depending on newer framework
classes as they may not exist on older devices using the module.

This change should only go to udc branches; note the merged-in below
refers to a change that was merged in all relevant branches, to ensure
that this change is not automerged anywhere.

Bug: 295788084
Test: m
Merged-In: I850242640f32bea3d46febcde5f3719619b1ea07
Change-Id: If533fef926ea0ad4e1e0b4d60c8f8e60f363fc1b
2023-09-05 15:22:06 +09:00
Remi NGUYEN VAN
85e7beb01b Merge "Factor out remoteauth dependencies to variables" into main am: 9bfa7ac0b9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2705538

Change-Id: Iff4f8b0a70fb8de25b2015a86010e0b168f47064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 05:24:39 +00:00
Remi NGUYEN VAN
baa2a7f3ab Merge "Factor out remoteauth dependencies to variables" into main am: 9bfa7ac0b9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2705538

Change-Id: Ia639995902ec219d333b60680868b6e59ed32169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 05:24:23 +00:00
Junyu Lai
35c69c7986 Address review followup comments for NetworkStats
This change includes:
1. Mark groupedBy*() deprecated and throw after android U.
2. Modify map() to mapKeysNotNull().
3. rename clearInterfaces to withoutInterfaces and refactoring.
4. Modify tests accordingly.

Test: atest FrameworksNetTests:android.net.connectivity.android.net.NetworkStatsTest
Fix: 296149902
Fix: 296150018
Change-Id: I5d97422ba957a212c0c5fbc1eee3f8b174343348
2023-09-04 18:01:14 +08:00
Remi NGUYEN VAN
c41daa4106 Factor out remoteauth dependencies to variables
This will allow using different values for the variables without having
merge conflicts in the dependencies list for each build rule.

Bug: 295788084
Test: m
Change-Id: I7b64a5a01d1f8139e7ce30ce95903d71cb09de9f
2023-08-31 19:08:17 +09:00
Igor Zaslavsky
378d54c4d5 Merge "Removing SystemApi added in aosp/2685327" into main am: e423ae1076
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2733765

Change-Id: I78bc441c765538098017916007b443671cb95fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 10:07:08 +00:00
Igor Zaslavsky
3713ae9c87 Merge "Removing SystemApi added in aosp/2685327" into main am: e423ae1076
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2733765

Change-Id: I71d46ea3327a0d302b6dcc385c7c78f9d2e54fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 04:10:51 +00:00
Igor Zaslavsky
edb12a4234 Removing SystemApi added in aosp/2685327
Removing all SystemApi added in aosp/2685327 until M-2023-11 train  release
Apis will be placed back after that

Test: built successfully.
Bug: 290092977
API-Coverage-Bug: 294934095
Change-Id: I12e8b21e6d21541930acdd14322156ad75b27be5
2023-08-30 21:17:28 +00:00
Xin Li
4a6c653160 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: Iff29b090c0b41d0103997a80788f09c2602df074
Change-Id: I5b03523defc88ffbc3aeab9ac8a29b4ca5a11f57
2023-08-25 13:52:17 -07:00
Igor Zaslavsky
3624a2b0ad Merge "Add RemoteAuthService" into main am: a92d8cab5f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2685327

Change-Id: Iaccc31ac6f55cc0aa7a835e21ecbea62cafef0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 20:47:33 +00:00
Igor Zaslavsky
ec344f4c18 Add RemoteAuthService
Add RemoteAuthService APIs and Stubs (hide) for Settings of D2DA

This CL introduces new SystemApi allow user to discover remote devices
compatible to be registered as remote authenticators via RemoteAuthManager

Design doc: go/remote-auth-manager-fishfood-design

Test: built successfully.
Bug: 290092977
API-Coverage-Bug: 294934095
Change-Id: Iaaae1126065fdc3db469eeb8d85ac654b8199a12
2023-08-24 17:50:11 +00:00
Kangping Dong
f0b1f49fb7 Merge "[Thread] move Thread into com.android.tethering" into main am: 0dc49df9a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2711574

Change-Id: If981e6249160d7965f24b48725a0ac206ea3b125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 09:04:50 +00:00
Kangping Dong
0dc49df9a4 Merge "[Thread] move Thread into com.android.tethering" into main 2023-08-23 08:37:38 +00:00
Kangping Dong
e7fef8938a [Thread] move Thread into com.android.tethering
Bug: 296211911
Change-Id: Ifd4f7cd06f1aeaba739d27d2328e89031ca73235
2023-08-23 14:28:50 +08:00
Maciej Żenczykowski
d5ba6a341a Merge "remove unused TcpTx/RxPackets java & jni constants" into main am: 359dacfd26
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2706913

Change-Id: Ia0cb8279bd191f0613dd0503239e7f613a8e88c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 15:05:53 +00:00
Maciej Żenczykowski
3ea9846413 Merge "simplify tcpTx/RxPackets" into main am: b4870c4ce2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2705380

Change-Id: Ib05aa6c82e4513549ea5d542ce0c0f1909bb7b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 15:05:36 +00:00
Maciej Żenczykowski
359dacfd26 Merge "remove unused TcpTx/RxPackets java & jni constants" into main 2023-08-18 14:49:40 +00:00
Maciej Żenczykowski
b4870c4ce2 Merge "simplify tcpTx/RxPackets" into main 2023-08-18 14:45:56 +00:00
Remi NGUYEN VAN
9237b1bd44 Merge "Add remoteauth to API owners" into main am: 0a49f9619f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2705539

Change-Id: I728ba750074d85bb63ed71daaa7999d775369a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 02:52:27 +00:00
Remi NGUYEN VAN
0a49f9619f Merge "Add remoteauth to API owners" into main 2023-08-15 01:55:11 +00:00
Remi NGUYEN VAN
a2009eaeec Add remoteauth to API owners
Similarly to Nearby, remoteauth is expected to regularly need to change
the API files.

Import the existing owners file for that purpose.

Test: m
Change-Id: I4b900481df3bf505a8209e5370dc4bc4c928dbee
2023-08-14 20:06:03 +09:00
Maciej Żenczykowski
6f0ec43200 remove unused TcpTx/RxPackets java & jni constants
(is this a valid change from hiddenapi perspective?)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2dc1c54c56a628770149382f1e25b90a71f62167
2023-08-13 09:32:33 +00:00
Maciej Żenczykowski
66645a8d68 simplify tcpTx/RxPackets
On T+ this is mainline code, and the bpf program (netd.c)
does not support collecting tcp specific stats.

(note: this *is* a behaviour change, as it currently
just always returns 0, but UNSUPPORTED/-1 seems to make
more sense)

Test: TreeHugger
Bug: 294604315
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ifda15e67d9167a2be98ab6f4e3817ff7c0bb3fea
2023-08-13 09:31:53 +00:00
Yuyang Huang
3330d2872d Enable service offload API am: 00cf7eda31
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2588445

Change-Id: Ib568900523bd3f691aa0f38e7a26195c2d8e670e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 16:09:20 +00:00
Yuyang Huang
32a0142d7f Add callbacks for service offload am: 33fa4d268c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2435053

Change-Id: I5ec211a4ebeeaa6fa03f5bbc4aaa356b9fed230f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 16:09:06 +00:00
Yuyang Huang
00cf7eda31 Enable service offload API
API-Coverage-Bug: 282618639
Bug: 269240366
Test: atest CtsNetTestCases
Change-Id: I7ac72b675ff3715891f31bc03c453e14b1264e40
2023-08-04 19:24:01 +09:00
Yuyang Huang
33fa4d268c Add callbacks for service offload
Components that can provide offload like IpClient (packet
filter offloading) can use the API to register a callback to be notified
when offload is necessary.

Bug: 269240366
Test: atest CtsNetTestCases
Change-Id: I8080702f5b530001b88e79e504f4722ac01bc576
2023-08-04 19:22:15 +09:00
Treehugger Robot
f2c956877f Merge "Deduplicate items after clear interface in NetworkStats" into main am: 865bfacab7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2664157

Change-Id: Ibf52519ed85148e4b758f0b7634e3fbfb8496c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 08:02:48 +00:00
Treehugger Robot
efff25fc77 Merge "Refactor grouped by methods" into main am: 15f0a621f8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2664156

Change-Id: Ieb843968558f488d79dc662499761eae80f57159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01 08:02:33 +00:00
Junyu Lai
23d89c0bbf Deduplicate items after clear interface in NetworkStats
Follow-up from commit Ie60829a65d0d9b5b63ad353695a820c0586e3665,
the interface field was cleared before returning the result to
the caller. However, this can cause problems in the
NetworkStats#subtract method. If the interface field is cleared,
the findIndexHinted method can match to a wrong entry.
This is because the keys of multiple entries will now be the
same. This can cause the subtract result to be unexpectedly
large and the return value of getUidStatsForTransport to be
mismatched with the values retrieved from other APIs.

Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest \
      FrameworksNetTests:android.net.connectivity.android.net.NetworkStatsTest
Bug: 290728278
Change-Id: I891ab29b8a2902663febc7c32b04417caf510926
2023-08-01 13:38:26 +08:00
Junyu Lai
0b9c0835b9 Refactor grouped by methods
This is a no-op refactoring, which re-write the group by methods
to use a common method that can slice NetworkStats by a given
lambda. This is useful for subsequent changes to slice NetworkStats
with different conditions.

Test: atest FrameworksNetTests:android.net.connectivity.android.net.NetworkStatsTest
Bug: 290728278
Change-Id: Ia28571021fba46fc59380798053ccdc91ddc6ae4
2023-08-01 11:32:04 +08:00
Paul Hu
adbb21630d Merge "Remove the ServiceTypeClient after socket destroyed" am: 6f47b7d501 am: 8bdeebe280 am: a512de7f99
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2564390

Change-Id: I7527c465e11c6b1d5a5dec8b7729df2e0d7188c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:43:21 +00:00
Paul Hu
a95aab25a5 Merge "Remove the ServiceTypeClient after socket destroyed" am: 6f47b7d501
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2564390

Change-Id: I7f455043115e10dc6cd533efa8566b4ab732fa79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 12:20:10 +00:00
Paul Hu
f2a51ac5f8 Remove the ServiceTypeClient after socket destroyed
The ServiceTypeClient should be removed after socket destroyed
because it's no longer used by any request. The requests will be
matched to the newly created ServiceTypeClient.

Bug: 278635632
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: Ia917b14d3666f3bfe8e874606a34800a4ce65c5a
2023-05-11 15:17:21 +08:00
Junyu Lai
8666042a78 Merge changes from topic "statsaccess" am: 9d25241337 am: a5b62b7439
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2528763

Change-Id: I858dd58dbd2c9ed415c52b12fce09f748c844fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 10:57:50 +00:00
Junyu Lai
9d25241337 Merge changes from topic "statsaccess"
* changes:
  Check MAINLINE_NETWORK_STACK as well to make GTS can access proper stats
  Move checkAnyPermissionOf to PermissionUtils
2023-04-14 09:54:49 +00:00
Paul Hu
a67bd9dd49 Merge "Add missed NSD event name" am: 86179beedb am: 86130adb35
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2530787

Change-Id: I7c4329b9e7fab5545d3edd2c6dbd56f5a045e52c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 03:29:44 +00:00
Paul Hu
99fdf93066 Add missed NSD event name
Some events are missed their name in the EVENT_NAMES array and
shows the number on dumpsys logs. Add their name to the event
array to show correct info.

Before:
 rec[0]: time=04-12 15:15:23.553 processed=DefaultState org=EnabledState dest=<null> what=21
 rec[1]: time=04-12 15:15:23.555 processed=EnabledState org=EnabledState dest=<null> what=REGISTER_SERVICE
 rec[2]: time=04-12 15:15:24.375 processed=EnabledState org=EnabledState dest=<null> what=DISCOVER_SERVICES
 rec[3]: time=04-12 15:15:25.338 processed=EnabledState org=EnabledState dest=<null> what=23
 rec[4]: time=04-12 15:15:25.342 processed=EnabledState org=EnabledState dest=<null> what=RESOLVE_SERVICE
 rec[5]: time=04-12 15:15:25.344 processed=EnabledState org=EnabledState dest=<null> what=23
 rec[6]: time=04-12 15:15:25.358 processed=EnabledState org=EnabledState dest=<null> what=UNREGISTER_SERVICE
 rec[7]: time=04-12 15:15:25.551 processed=DefaultState org=EnabledState dest=<null> what=22

After:
 rec[0]: time=04-12 15:19:58.955 processed=DefaultState org=EnabledState dest=<null> what=REGISTER_CLIENT
 rec[1]: time=04-12 15:19:58.958 processed=EnabledState org=EnabledState dest=<null> what=REGISTER_SERVICE
 rec[2]: time=04-12 15:19:59.979 processed=EnabledState org=EnabledState dest=<null> what=DISCOVER_SERVICES
 rec[3]: time=04-12 15:20:00.768 processed=EnabledState org=EnabledState dest=<null> what=MDNS_DISCOVERY_MANAGER_EVENT
 rec[4]: time=04-12 15:20:00.777 processed=EnabledState org=EnabledState dest=<null> what=RESOLVE_SERVICE
 rec[5]: time=04-12 15:20:00.778 processed=EnabledState org=EnabledState dest=<null> what=MDNS_DISCOVERY_MANAGER_EVENT
 rec[6]: time=04-12 15:20:00.785 processed=EnabledState org=EnabledState dest=<null> what=UNREGISTER_SERVICE
 rec[7]: time=04-12 15:20:00.925 processed=DefaultState org=EnabledState dest=<null> what=UNREGISTER_CLIENT

Test: adb shell dumpsys servicediscovery
Bug: 275004614
Change-Id: I9c05efc2d2993af353a2a902fd8810f53ab2cd16
2023-04-12 15:24:02 +08:00
Junyu Lai
e68c42b888 Check MAINLINE_NETWORK_STACK as well to make GTS can access proper stats
Follow up from aosp/1933093. The test failed because certain
devices use a flattened apex that lacks the NETWORK_STACK
permission for sharing with the GTS apk.
Additionally, the NetworkStatsAccess does not recognize the
GTS apk, which holds the MAINLINE_NETWORK_STACK permission.

Test: TH
Bug: 275532605
Change-Id: Icce80a3d3dbea4a84fbd369d9b5fbe0029ab463e
2023-04-11 14:56:15 +08:00
Chalard Jean
ea8ea49862 Fix a var name in a comment am: e2294fb13e am: 848e0d3589
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2526882

Change-Id: If2586cc4a74d1c8385ab67b0a37328965d727d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 04:52:41 +00:00
Jean Chalard
19b814793b Merge "Rename throwAboveU to throwAtLeastU" am: 5edc307e57 am: 175f475ded
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2527124

Change-Id: Ie754523e14ac1d37c1398d5e913b4b11aa248527
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 02:29:46 +00:00
Chalard Jean
e2294fb13e Fix a var name in a comment
Remaining comment from aosp/2527124

Test: comment-only change
Change-Id: Ic0418bf0bc15b854e25e211bc7399d83487fe971
2023-04-10 10:38:20 +09:00
Chalard Jean
1bfd3ccf0b Rename throwAboveU to throwAtLeastU
And address other comments on aosp/2527139

Bug: 273963543
Test: FrameworksNetTests
Change-Id: I4328aea2881badc2be667b900b7ac2a296af1678
2023-04-07 12:19:10 +09:00
Chalard Jean
843cd6ca48 Restore the null behavior of buildWifiTemplate
The old behavior was to only return those wifis that have
a null key/subscriber ID (e.g. not carrier wifi). To keep
backward compatibility, restore that behavior.

Also only crash the old methods on devices with initial
SDK U, because it can't be mandated that devices that
upgrade must not call these methods.

Bug: 273963543
Test: FrameworksNetTests
Merged-In: Iefb976ed86a732158964fae38e9e601001c2637a
Change-Id: Iefb976ed86a732158964fae38e9e601001c2637a
2023-04-07 02:49:28 +00:00
Chalard Jean
e025f40012 [automerge] Restore the null behavior of buildWifiTemplate 2p: 4c0fb401be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/22503686

Bug: 273963543
Change-Id: I1f0c2497869e8539d84e2c39780df4bf91458cc3
2023-04-06 08:24:11 +00:00
Chalard Jean
4c0fb401be Restore the null behavior of buildWifiTemplate
The old behavior was to only return those wifis that have
a null key/subscriber ID (e.g. not carrier wifi). To keep
backward compatibility, restore that behavior.

Also only crash the old methods on devices with initial
SDK U, because it can't be mandated that devices that
upgrade must not call these methods.

Bug: 273963543
Test: FrameworksNetTests
Change-Id: Iefb976ed86a732158964fae38e9e601001c2637a
(cherry picked from commit 78f94fc15035560c279f8e9378561e60a676410a)
2023-04-06 17:23:53 +09:00
Remi NGUYEN VAN
96054db62b Merge "Do not crash when passing null into buildTemplateMobileAll" am: 8a78f043ea am: bb0baa63eb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2510560

Change-Id: Ia953c32c4e260c0d8efc34ae8d82c0f33ae049ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 02:26:46 +00:00
Remi NGUYEN VAN
8a78f043ea Merge "Do not crash when passing null into buildTemplateMobileAll" 2023-04-04 01:27:41 +00:00
Treehugger Robot
1edb3c22c4 Merge "Cleanup visibility of framework-connectivity-t.impl" am: 85de09411f am: f9021773f9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2503715

Change-Id: I60e33670b813e3c84bf059b9a95ef5b9188b2e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 05:33:00 +00:00
Treehugger Robot
85de09411f Merge "Cleanup visibility of framework-connectivity-t.impl" 2023-03-31 04:50:32 +00:00