Commit Graph

928 Commits

Author SHA1 Message Date
Patrick Rohr
a68fba1659 Merge "Revert^2 "Change Ethernet API to use OutcomeReceiver"" 2022-03-22 10:00:08 +00:00
Patrick Rohr
4e6570c359 Merge "Revert^2 "Change Ethernet API to use OutcomeReceiver"" 2022-03-22 10:00:08 +00:00
Patrick Rohr
da9751f6e5 Merge "Revert^2 "Change Ethernet API to use OutcomeReceiver"" 2022-03-22 10:00:08 +00:00
Remi NGUYEN VAN
d5820ab896 Merge "Add executors to NsdManager" am: b58df4bf13 am: ef37e45e8a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2027043

Change-Id: I1b9ec283274aa162ee1e5d5165caa221965b7bbf
2022-03-22 09:46:04 +00:00
Remi NGUYEN VAN
d12566508b Merge "Add Executors to NSD callbacks" am: 009094b070 am: 34759d1685 am: 801152830c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027063

Change-Id: Ief40c29dce0484983f95d66d8506a24b35a46b30
2022-03-22 09:46:03 +00:00
Remi NGUYEN VAN
ef37e45e8a Merge "Add executors to NsdManager" am: b58df4bf13
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2027043

Change-Id: I93294667e79684652dba065583e651148a8d0991
2022-03-22 08:46:00 +00:00
Remi NGUYEN VAN
8d0fa1c2ad Merge "Add Executors to NSD callbacks" 2022-03-22 08:33:48 +00:00
Remi NGUYEN VAN
009094b070 Merge "Add Executors to NSD callbacks" 2022-03-22 08:33:48 +00:00
Remi NGUYEN VAN
b58df4bf13 Merge "Add executors to NsdManager" 2022-03-22 08:33:48 +00:00
Chun Zhang
44d4b3d1e9 Merge "Address API review feedback" into tm-dev 2022-03-18 22:45:15 +00:00
Xinyi Zhou
2f054086c5 Merge "Update system-current.txt to resolve API council comments" into tm-dev 2022-03-18 21:24:38 +00:00
Xiao Ma
3abd1033d2 Merge "Add getInterfaceList module-lib API in EthernetManager." into tm-dev 2022-03-18 13:00:01 +00:00
Mark Chien
7fd5a98d6a Merge "Add setEthernetEnabled and its listener API" into tm-dev 2022-03-18 11:43:52 +00:00
Remi NGUYEN VAN
c7aa9e3c62 Add Executors to NSD callbacks
Add Executor variants to all methods with callbacks.

Bug: 218752665
Test: atest NsdManagerTest
Change-Id: I4c31e2d7ae601ea808b1fd64df32d116c6fff97f
2022-03-18 09:26:11 +00:00
Remi NGUYEN VAN
1d36db9653 Add Executors to NSD callbacks
Add Executor variants to all methods with callbacks.

Bug: 218752665
Test: atest NsdManagerTest
Change-Id: I4c31e2d7ae601ea808b1fd64df32d116c6fff97f
2022-03-18 09:26:11 +00:00
Xiao Ma
9e3173a8b6 Update the module-lib API txt with getInterfaceList api.
Bug: 171872016
Test: m
Ignore-AOSP-First: avoid build break due to the automerge order.
Change-Id: I16c69aa0d236036a600bdae9fb8326ff70fd4fda
2022-03-18 18:25:40 +09:00
markchien
6d2cbfeb3b Update the module-lib API txt with setEthernetEnable API
Bug: 171872016
Test: atest EthernetServiceTests
Ignore-AOSP-First: to avoid diamond automerge cause build break, will
cherry-pick back to AOSP once this is merged

Change-Id: I61c5209f50ab62327b75813804bde1aa1a014054
2022-03-18 18:25:40 +09:00
Xiao Ma
217c99da20 Add getInterfaceList module-lib API in EthernetManager.
Bug: 171872016
Test: m
Change-Id: Ib0e6c8f67c6ded7d17bb9e0ff49e7ff495c8819d
2022-03-18 17:18:54 +09:00
markchien
db9e89aa7b Add setEthernetEnabled and its listener API
Bug: 171872016
Test: atest EthernetServiceTests

Change-Id: Iefd24d955572589c5bd3ca9a8139ea6e44979e8a
2022-03-18 17:12:56 +09:00
Patrick Rohr
dceb895995 Fix ethernet enable / disable API
The ethernet APIs connectNetwork() / disconnectNetwork() are
inaccurately named. Physical link state cannot be changed by calling an
API. This change renames these functions to enableInterface and
disableInterface, respectively, to better reflect their intention and
behavior.

Test: atest EthernetManagerPermissionTest
Ignore-AOSP-First: CP to make automerger happy.
Change-Id: I3361ad0e01e761ffd77faf6c55924fa4612ede90
2022-03-18 07:24:01 +00:00
Chun Zhang
fa9c46a2d7 Address API review feedback
"Can you use a Service instead of having a non-service Base class?".

Bug: 218682005
Test: existing CTS/UNIT test
Ignore-AOSP-First: nearby_not_in_aosp_yet
CTS-Coverage-Bug: 205591293
Change-Id: I6e743f89f09e3cf27a96e60ad52bd0d2d9074a1a
2022-03-17 22:37:40 -07:00
Patrick Rohr
58b2dffa1c Change Ethernet API to use OutcomeReceiver
This change addresses API review feedback. In addition, it changes the
returned result from Network to the interface name. The current API
returning a Network object is racy and cannot be implemented correctly.
Users should instead use the ConnectivityManager#requestNetwork() API to
get hold of the Network for a given interface.

Bug: 220017952
Test: TH
Ignore-AOSP-First: CP to make automerger happy.
Change-Id: I7c46545a47034be409071c2ec007d9e1480c6ed0
2022-03-18 12:19:52 +08:00
Patrick Rohr
2cef8f1314 Revert^2 "Change Ethernet API to use OutcomeReceiver"
41000c6106

Merged-In: I4c204a8489c0be006c00581d833f2bb46ae0e71d
Change-Id: I42f5ca159db523f85903c411c4a4838eb324c5ad
2022-03-18 12:11:51 +08:00
Patrick Rohr
d6156a930e Revert^2 "Change Ethernet API to use OutcomeReceiver"
369c79bca4

Merged-In: I7c46545a47034be409071c2ec007d9e1480c6ed0
Change-Id: If9b055e0862755f1d33b5ba6e026fd827bc1d0ea
2022-03-18 12:06:27 +08:00
Patrick Rohr
39ef30ce64 Revert^2 "Change Ethernet API to use OutcomeReceiver"
7844d41513

Merged-In: I7c46545a47034be409071c2ec007d9e1480c6ed0
Change-Id: If9b055e0862755f1d33b5ba6e026fd827bc1d0ea
2022-03-18 12:06:27 +08:00
Xinyi Zhou
b4efda8f20 Update system-current.txt to resolve API council comments
Bug: 216294721
Test: Compiled
Ignore-AOSP-First: nearby_not_in_aosp_yet
CTS-Coverage-Bug: 213364287
Change-Id: Iab7b1d80c164baa5268daa7e22b19b0cd09bc057
2022-03-17 15:43:13 -07:00
Patrick Rohr
fa376a5e7c Fix ethernet enable / disable API
The ethernet APIs connectNetwork() / disconnectNetwork() are
inaccurately named. Physical link state cannot be changed by calling an
API. This change renames these functions to enableInterface and
disableInterface, respectively, to better reflect their intention and
behavior.

Test: atest EthernetManagerPermissionTest
Ignore-AOSP-First: CP to make automerger happy.
Change-Id: I0f2866d09b745e7bdb261a1258f94cfd51223a8f
2022-03-17 19:02:52 +00:00
Patrick Rohr
c551ebbc37 Change Ethernet API to use OutcomeReceiver
This change addresses API review feedback. In addition, it changes the
returned result from Network to the interface name. The current API
returning a Network object is racy and cannot be implemented correctly.
Users should instead use the ConnectivityManager#requestNetwork() API to
get hold of the Network for a given interface.

Bug: 220017952
Test: TH
Ignore-AOSP-First: CP to make automerger happy.
Change-Id: I4c204a8489c0be006c00581d833f2bb46ae0e71d
2022-03-17 19:01:39 +00:00
Quentin Perret
77c2f08780 Merge "Revert "Change Ethernet API to use OutcomeReceiver"" am: 2789c017e6 am: 3234a71d32
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2030087

Change-Id: I6d1a63498b3976f0ecc3e2c2dac359a6d99713aa
2022-03-17 17:02:49 +00:00
Quentin Perret
eac786e2ff Merge "Revert "Change Ethernet API to use OutcomeReceiver"" am: 8efc170b0b am: 4f24e69879 am: 8ee0c2bbc4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030086

Change-Id: I063096a6502f8b8536e797ab30b0be09ae7401b8
2022-03-17 17:02:48 +00:00
Quentin Perret
3234a71d32 Merge "Revert "Change Ethernet API to use OutcomeReceiver"" am: 2789c017e6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2030087

Change-Id: I75374042046405c438c5701413f0b4e1b3c712b0
2022-03-17 15:58:08 +00:00
Quentin Perret
369c79bca4 Revert "Change Ethernet API to use OutcomeReceiver"
Revert "Change network management listener to outcome receiver"

Revert submission 2028203-ethernet-outcomereceiver

Reason for revert: BuildMonitor investigating b/225169800
Reverted Changes:
I4c204a848:Change Ethernet API to use OutcomeReceiver
I7c46545a4:Change Ethernet API to use OutcomeReceiver
Id8fadfed9:Change network management listener to outcome rece...

Change-Id: I45af594f7233ed89113f4cf7f977092271980672
2022-03-17 15:20:53 +00:00
Quentin Perret
7844d41513 Revert "Change Ethernet API to use OutcomeReceiver"
Revert "Change network management listener to outcome receiver"

Revert submission 2028203-ethernet-outcomereceiver

Reason for revert: BuildMonitor investigating b/225169800
Reverted Changes:
I4c204a848:Change Ethernet API to use OutcomeReceiver
I7c46545a4:Change Ethernet API to use OutcomeReceiver
Id8fadfed9:Change network management listener to outcome rece...

Change-Id: I45af594f7233ed89113f4cf7f977092271980672
2022-03-17 15:20:53 +00:00
Quentin Perret
41000c6106 Revert "Change Ethernet API to use OutcomeReceiver"
Revert "Change Ethernet API to use OutcomeReceiver"

Revert "Change network management listener to outcome receiver"

Revert submission 2028203-ethernet-outcomereceiver

Reason for revert: BuildMonitor investigating b/225169800
Reverted Changes:
I4c204a848:Change Ethernet API to use OutcomeReceiver
I7c46545a4:Change Ethernet API to use OutcomeReceiver
Id8fadfed9:Change network management listener to outcome rece...

Change-Id: Ibd1d70ac3fb691f9a777e59da4886ab60dc969ac
2022-03-17 15:20:53 +00:00
Patrick Rohr
f363822d87 Merge "Change Ethernet API to use OutcomeReceiver" am: a8385cc593 am: e4172aceb8 am: 4c4dbae06b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2029244

Change-Id: I8b498aeafaf9894b66f8e9f1f364517e31fd7be1
2022-03-17 14:53:25 +00:00
Patrick Rohr
a5a7bd70c7 Merge "Change Ethernet API to use OutcomeReceiver" am: a7b1911815 am: b12e08bdfe am: 7e9fe04fb9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2028164

Change-Id: I3161e6e7022eaa30e89e3322bcf6298f48753f00
2022-03-17 14:53:24 +00:00
Patrick Rohr
575ec9bb10 Merge "Change Ethernet API to use OutcomeReceiver" am: a8385cc593
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2029244

Change-Id: I250cb3129fe2172082a97662640be8269ad748f8
2022-03-17 14:18:31 +00:00
Remi NGUYEN VAN
59145dc7f8 Add executors to NsdManager
Add executors to APIs added in T, and overloads with Executors for
consistency to register/resolve.

Bug: 218752665
Test: atest NsdManagerTest
Change-Id: I9d89ea8352aa8274a90bf6cb273d5b45828f53cc
2022-03-17 11:01:56 +00:00
Patrick Rohr
5a9011125b Merge changes from topic "nullable-ipconfig" am: 1b13af010a am: 3a74a64079
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2026565

Change-Id: Idd172582e5d1f0d401b999b7eb8f1a5e5311ee5d
2022-03-17 08:13:58 +00:00
Patrick Rohr
8d59ceeb28 Merge "Add Nullable IpConfiguration to ethernet update request" am: bc1479af8f am: f95355f826 am: d520904a20
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2025283

Change-Id: Ib2e58c9e451b51ed80136bba585a098bc0ddb45a
2022-03-17 08:13:57 +00:00
Patrick Rohr
cf01b8a4f7 Change Ethernet API to use OutcomeReceiver
This change addresses API review feedback. In addition, it changes the
returned result from Network to the interface name. The current API
returning a Network object is racy and cannot be implemented correctly.
Users should instead use the ConnectivityManager#requestNetwork() API to
get hold of the Network for a given interface.

Bug: 220017952
Test: TH
Change-Id: I7c46545a47034be409071c2ec007d9e1480c6ed0
2022-03-17 08:20:45 +01:00
Patrick Rohr
77a3a8408b Change Ethernet API to use OutcomeReceiver
This change addresses API review feedback. In addition, it changes the
returned result from Network to the interface name. The current API
returning a Network object is racy and cannot be implemented correctly.
Users should instead use the ConnectivityManager#requestNetwork() API to
get hold of the Network for a given interface.

Bug: 220017952
Test: TH
Change-Id: I7c46545a47034be409071c2ec007d9e1480c6ed0
2022-03-17 08:20:45 +01:00
Patrick Rohr
3a74a64079 Merge changes from topic "nullable-ipconfig" am: 1b13af010a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2026565

Change-Id: I3564ece377766d0e3b2cb6f98209b00dc3a60697
2022-03-17 07:04:24 +00:00
Patrick Rohr
ea7e6d56f4 Change Ethernet API to use OutcomeReceiver
This change addresses API review feedback. In addition, it changes the
returned result from Network to the interface name. The current API
returning a Network object is racy and cannot be implemented correctly.
Users should instead use the ConnectivityManager#requestNetwork() API to
get hold of the Network for a given interface.

Bug: 220017952
Test: TH
Change-Id: I4c204a8489c0be006c00581d833f2bb46ae0e71d
2022-03-17 07:21:33 +01:00
Chun Zhang
687bdb2c60 Merge "Address API review feedback" into tm-dev 2022-03-17 02:09:49 +00:00
Junyu Lai
7a01fb6c68 Merge "[MS83.1] Make some APIs module-lib instead of system current" into tm-dev 2022-03-17 01:50:14 +00:00
Junyu Lai
40cc6b656e Merge "[MS83.2] Make some APIs module-lib instead of system current" into tm-dev 2022-03-17 01:50:14 +00:00
TreeHugger Robot
e2b4a05be9 Merge "API changes for resolving API council comments." into tm-dev 2022-03-16 23:31:59 +00:00
Chun Zhang
d9d12aa98f Address API review feedback
"Can the getters be made public so this can be CTS tested?"
"Please add getters and mark them @TestApi so CTS can use them."
"Antispoofkey and AntiSpoofkey should be AntispoofKey."
"please rename accountKey to something like deviceAccountKey"

Getters are added as SystemApi since @TestApi doesn't work well with mainline.

BUG: 218682005
BUG: 222489854
Test: unit test
Ignore-AOSP-First: nearby_not_in_aosp_yet
CTS-Coverage-Bug: 205591293
Change-Id: I9e1a69b2b744b0f19fa13fe6215237317725390d
2022-03-16 14:12:59 -07:00
Patrick Rohr
8a910f4ecd Add Nullable IpConfiguration to ethernet update request
Test: atest EthernetServiceTests
Bug: 220017952
Change-Id: Icb5af11e67e397628484726ab6f69afa5d1fe7f5
2022-03-16 20:29:05 +01:00