Commit Graph

928 Commits

Author SHA1 Message Date
Paul Hu
ac780d3bd0 Merge changes from topic "MDns_AIDL" am: 09475308b7 am: 06e59627bb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2049246

Change-Id: I16b7ec71fbfee1dd0de84b1f64d5e9fbbd62f4e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 03:10:55 +00:00
Paul Hu
06e59627bb Merge changes from topic "MDns_AIDL" am: 09475308b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2049246

Change-Id: I2f4c2952ae732350ebc0608fde6263ed20061e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 02:42:02 +00:00
Paul Hu
09475308b7 Merge changes from topic "MDns_AIDL"
* changes:
  Use MDns aidl on NsdService
  Add MDnsManager
2022-04-07 02:06:35 +00:00
Maciej Żenczykowski
8a43622447 Merge changes Iafa8979d,I44eac159,I27ad3298 am: 6097358382 am: ec84e33d10
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2042596

Change-Id: I8f6867128057d092e916515049078c1d68b427a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:20:45 +00:00
Maciej Żenczykowski
ec84e33d10 Merge changes Iafa8979d,I44eac159,I27ad3298 am: 6097358382
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2042596

Change-Id: Id4f6dc83bf8d4236d1dc585f1a1c8097dcf2fbb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:58:44 +00:00
paulhu
2b9ed95ae5 Use MDns aidl on NsdService
- Use MDns aidl to communicate with mdns service and register
  event listener to receive callback.
- Remove all NDC relevant code on NsdService.
- Use MDns aidl on NsdServiceTest.

Bug: 209894875
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I65929dee3838fef753396e86c665abd66b6fec81
2022-04-04 15:18:27 +00:00
paulhu
541b72d03b Add MDnsManager
- Have MDnsManager to manage mdns native service binder call.
- Register it as a system service for NsdService.
- NsdService will use aidl to communicate with mdns, so add the
  relevant lib to framework-connectivity
- Add jarjar rule for mdns-aidl-interface classes.

Bug: 209894875
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: Ibc8b726c01a15015b450caf94d0afed570117b7f
2022-04-04 15:02:17 +00:00
Patrick Rohr
50c470e308 Address EthernetManager javadoc review comments
Test: TH
Change-Id: Iafa8979d8e96ea4d078b017e56ee61334d33b5f5
2022-04-04 14:59:42 +02:00
Patrick Rohr
0f2cbe92f1 Update javadoc to match expectation for UnsupportedOperationException
Test: builds
Change-Id: I44eac15972ed099fc12599a78a71557a7b16d593
2022-04-04 14:59:42 +02:00
Xiao Ma
f90f1efff4 Remove unused empty filegroups from connectivityT package.
connectivity-tiramisu-sources filegroup in the framework-t and service
folder is useless after moving all source files to updatable-sources
filegroup, delete them from f/b/packages/connectivityT.

Bug: 210586283
Test: m
Change-Id: I22e9a70a04929144488380d1530cd7baa78ce056
2022-04-04 07:00:59 +00:00
Xinyi Zhou
85c3e0883c Remove fast pair scan API
Bug: 227513829
Test: Built and verified no FP UI in settings
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I4bdf8653d0b3a85fbb53786818adb4c3ca39567a
2022-03-31 23:48:15 -07:00
Patrick Rohr
cc97aed683 Add framework-t, service-t to sc-mainline prod
Ignores changes to the following files:
- Tethering/apex/Android.bp
- framework-t/Android.bp
- service-t/Android.bp
- service/Android.bp
- tests/deflake/Android.bp
- tests/unit/Android.bp

Test: TH
Merged-In: I06e2568e5e01d855783383552d1b0d7732cefbe0
Change-Id: I345bf07369b7f7025626e8e924f3bafa92c0d54f
2022-03-31 16:12:14 +02:00
Chun Zhang
74607dd786 Remove Fast Pair system APIs.
Bug: 227513829
Test: cts test
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I21b33cb8dcb7f6eee1ecc39115fc153e9a975e7c
2022-03-31 02:32:03 +00:00
Wei Wang
06daa43e83 Merge "Improve the comments of getMedium." into tm-dev 2022-03-30 20:56:45 +00:00
Junyu Lai
b10a2db32f Merge "Make some NetworkStats APIs system-current" into tm-dev 2022-03-30 09:38:21 +00:00
junyulai
6801690383 Make some NetworkStats APIs system-current
Move iterator and NetworkStats.Entry getters to system-current
according to API council feedback. This reverts parts of
ag/17117903.

Ignore-AOSP-First: Parent CLs does not exist in aosp yet.
Test: TH
Fix: 225168182
Change-Id: Ia7fdf8d31a96a26b0bf1682f462292b051560477
2022-03-30 09:38:11 +00:00
Wei Wang
f5bb26fed8 Improve the comments of getMedium.
Also remove public identity type as it's not used.

Bug:222291470

Test: atest CtsNearbyFastPairTestCases
Ignore-AOSP-First: new project
Change-Id: I938fbabc4c042da91b1d316b0bf892cb377db1ba
2022-03-29 17:14:35 -07:00
Chun Zhang
e4440de521 Remove unused system apis.
Test: CTS
Bug: 204780849
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ifb09499f600450c43a8f8b56354e646d38a108e7
2022-03-29 16:21:42 -07:00
Chun Zhang
5ab2a85492 Merge "Require Permission Manifest.permission.WRITE_SECURE_SETTINGS on setFastPairScanEnabled API." into tm-dev 2022-03-25 23:47:54 +00:00
Remi NGUYEN VAN
0395b70000 Use Sources.bp for building
Reference Sources.bp from Android.bp, so that they are used as build
files.

Sources.bp is separate from Android.bp as it was migrated from the
Android.bp files in the old code location. They can be merged into the
main Android.bp file (or removed by removing the filegroups) after the
migration is done.

Also remove references to the AIDL filegroups, as files are now merged
into the common framework/aidl-export directory which is used as include
directory for aidl source generation already, so they do not need to be
referenced separately. framework/aidl-export can contain AIDLs for S-
API classes that became updatable API in T (the contents of
framework-t), as they are the same as any other API class for the
purposes of AIDL code generation: it's OK for any S+ code to reference
S+ API classes.

Finally, fix reference to mByteStream in IpConfigStoreTest. It was
already wrong but did not break the build because the test was not being
built in the old location.

Bug: 222234190
Test: TH
Merged-In: I81893df9f327abb84f1561b2b33027a2d23a4d65
Merged-In: I67c703e3f7aa9d5787f032a79ed62e45412baf4f
Change-Id: I9093f9ae2f9d76e597f20de48680e459891755b4
2022-03-25 14:58:43 +00:00
Remi NGUYEN VAN
700ffc994f Merge history of ConnectivityT
Renamed files/directories:
ConnectivityT/service/Android.bp --> service-t/Sources.bp
ConnectivityT/framework-t/Android.bp --> framework-t/Sources.bp
ConnectivityT/framework-t/aidl-export --> framework/aidl-export
ConnectivityT/service --> service-t
ConnectivityT/framework-t --> framework-t
ConnectivityT/tests --> tests
ConnectivityT/OWNERS --> (removed)

BUG: 222234190
TEST: TH
Ignore-AOSP-First: Move with history done per-branch
Merged-In: I81893df9f327abb84f1561b2b33027a2d23a4d65
Merged-In: I67c703e3f7aa9d5787f032a79ed62e45412baf4f
Change-Id: I27a91f1a94f9d807f92762436f533c4b0d0114d5
2022-03-25 11:02:45 +00:00
Remi NGUYEN VAN
3476030bad Use Sources.bp for building
Reference Sources.bp from Android.bp, so that they are used as build
files.

Sources.bp is separate from Android.bp as it was migrated from the
Android.bp files in the old code location. They can be merged into the
main Android.bp file (or removed by removing the filegroups) after the
migration is done.

Also remove references to the AIDL filegroups, as files are now merged
into the common framework/aidl-export directory which is used as include
directory for aidl source generation already, so they do not need to be
referenced separately. framework/aidl-export can contain AIDLs for S-
API classes that became updatable API in T (the contents of
framework-t), as they are the same as any other API class for the
purposes of AIDL code generation: it's OK for any S+ code to reference
S+ API classes.

Finally, fix reference to mByteStream in IpConfigStoreTest. It was
already wrong but did not break the build because the test was not being
built in the old location.

Bug: 222234190
Test: TH
Merged-In: I87843d554d1e726158f8784aa2ec61c92867ad3e
Change-Id: I9093f9ae2f9d76e597f20de48680e459891755b4
2022-03-25 09:47:23 +00:00
Remi NGUYEN VAN
af582a015b Use Sources.bp for building
Reference Sources.bp from Android.bp, so that they are used as build
files.

Sources.bp is separate from Android.bp as it was migrated from the
Android.bp files in the old code location. They can be merged into the
main Android.bp file (or removed by removing the filegroups) after the
migration is done.

Also remove references to the AIDL filegroups, as files are now merged
into the common framework/aidl-export directory which is used as include
directory for aidl source generation already, so they do not need to be
referenced separately. framework/aidl-export can contain AIDLs for S-
API classes that became updatable API in T (the contents of
framework-t), as they are the same as any other API class for the
purposes of AIDL code generation: it's OK for any S+ code to reference
S+ API classes.

Finally, fix reference to mByteStream in IpConfigStoreTest. It was
already wrong but did not break the build because the test was not being
built in the old location.

Bug: 222234190
Test: TH
Merged-In: I1fe5091361c7766dc7b6b4fb8c7b62d403e950bb
Change-Id: If738f607be84b3d7e2045a83a4d2976ed0d4e188
2022-03-25 09:46:39 +00:00
Chun Zhang
32a93a5ce6 Require Permission Manifest.permission.WRITE_SECURE_SETTINGS on setFastPairScanEnabled API.
Test: CTS
Bug: 216590902
Ignore-AOSP-First: nearby_not_in_aosp_yet

Change-Id: I017af7de2ba930aa15d862138684eb4dce884348
2022-03-25 04:27:22 +00:00
Remi NGUYEN VAN
31bb94f3bc Merge history of ConnectivityT
Renamed files/directories:
ConnectivityT/service/Android.bp --> service-t/Sources.bp
ConnectivityT/framework-t/Android.bp --> framework-t/Sources.bp
ConnectivityT/framework-t/aidl-export --> framework/aidl-export
ConnectivityT/service --> service-t
ConnectivityT/framework-t --> framework-t
ConnectivityT/tests --> tests
ConnectivityT/OWNERS --> (removed)

BUG: 222234190
TEST: TH
Ignore-AOSP-First: Move with history done per-branch
Merged-In: I87843d554d1e726158f8784aa2ec61c92867ad3e
Change-Id: I7a11af7a1fc124dff2372efe275d59855255df7b
2022-03-24 14:40:07 +00:00
Remi NGUYEN VAN
3464805acc Merge history of ConnectivityT
Renamed files/directories:
ConnectivityT/service/Android.bp --> service-t/Sources.bp
ConnectivityT/framework-t/Android.bp --> framework-t/Sources.bp
ConnectivityT/framework-t/aidl-export --> framework/aidl-export
ConnectivityT/service --> service-t
ConnectivityT/framework-t --> framework-t
ConnectivityT/tests --> tests
ConnectivityT/OWNERS --> (removed)

BUG: 222234190
TEST: TH
Merged-In: I1fe5091361c7766dc7b6b4fb8c7b62d403e950bb
Change-Id: Ib592434ff50c06e25894f6ed7d7e3e8e1e3ea67b
2022-03-24 14:19:13 +00:00
Patrick Rohr
d1b7de70a1 Merge "Update the module-lib API txt with getInterfaceList api." am: f7c4dcaaf4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2028286

Change-Id: Ie7c29f2065e7daf5952d81d3feb3f5e823a1966a
2022-03-24 06:32:05 +00:00
Patrick Rohr
85780a92a2 Merge "Fix ethernet enable / disable API" am: 04f9843d32
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2029245

Change-Id: I453e0833654f71d430727444df959c22929d72b9
2022-03-24 06:30:25 +00:00
Patrick Rohr
e38626a4a2 Merge "Add getInterfaceList module-lib API in EthernetManager." 2022-03-24 06:15:43 +00:00
Patrick Rohr
f7c4dcaaf4 Merge "Update the module-lib API txt with getInterfaceList api." 2022-03-24 06:15:43 +00:00
Patrick Rohr
589873fcba Merge "Add getInterfaceList module-lib API in EthernetManager." 2022-03-24 06:15:43 +00:00
Patrick Rohr
04f9843d32 Merge "Fix ethernet enable / disable API" 2022-03-24 06:09:28 +00:00
Patrick Rohr
95738f7c18 Merge "Fix ethernet enable / disable API" 2022-03-24 06:09:28 +00:00
Patrick Rohr
24f7b378c2 Merge "Fix ethernet enable / disable API" 2022-03-24 06:09:28 +00:00
Treehugger Robot
420d7f14b1 Merge "Update the module-lib API txt with setEthernetEnable API" am: b3edbd35b6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2029963

Change-Id: I281d16dd56dbd1602f2bed1909b90cfcf4b78858
2022-03-23 20:00:21 +00:00
Xinyi Zhou
1b2a5bf724 Resolve API council feedback
Test: built and verified logs
Fix: 225116248
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ic30aee650fd41287d3a363491fa602cd990467a8
2022-03-23 19:05:29 +00:00
Xiao Ma
bdfed34bbc Update the module-lib API txt with getInterfaceList api.
Bug: 171872016
Test: m
Merged-In: I16c69aa0d236036a600bdae9fb8326ff70fd4fda
Change-Id: I1ee2ad76b4950906516fae7328785b8c583f7adb
2022-03-23 15:18:24 +00:00
Patrick Rohr
37f302e109 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.

CP note: the Merged-In ID is not the actual Change-Id of this change in
tm-dev. This change was originally merged in aosp, but was subsequently
reverted and cherry-picked into tm-dev. The cherry-pick falsely reused
the Change-Id of the (now reverted) original change. This causes
automerger to skip this change on all branches between aosp-master and
tm-dev when the correct Merged-In ID is used. Therefore, the Merged-In
ID listed is the Change-Id of an unrelated change that is present in
tm-dev but not aosp-master.

Bug: 220017952
Test: TH
Ignore-AOSP-First: CP to make automerger happy.
Merged-In: I61c5209f50ab62327b75813804bde1aa1a014054
Change-Id: I4c204a8489c0be006c00581d833f2bb46ae0e71d
2022-03-23 11:45:06 +00:00
markchien
e1cde2694f Update the module-lib API txt with setEthernetEnable API
Bug: 171872016
Test: atest EthernetServiceTests
Change-Id: I61c5209f50ab62327b75813804bde1aa1a014054
Merged-In: I61c5209f50ab62327b75813804bde1aa1a014054
2022-03-23 17:02:14 +08:00
Chun Zhang
acff90b51f Merge "Merge history of Nearby" into tm-dev 2022-03-22 21:26:11 +00:00
Remi NGUYEN VAN
d84be86d24 Merge history of Nearby
BUG: 222234190
TEST: TH
Merged-In: I7fd9cc67244f2533057e679b0bc5e1db126cd399
Change-Id: Ie7a308b2a0294a50467443dc935082c2e88d27f7
2022-03-22 16:37:29 +00:00
Xiao Ma
1edd4554e5 Add getInterfaceList module-lib API in EthernetManager.
Bug: 171872016
Test: m
Merged-In: Ib0e6c8f67c6ded7d17bb9e0ff49e7ff495c8819d
Change-Id: I94fd147d0f8cf09cb7445fd2b5bc8e4528e8390e
2022-03-22 13:59:40 +00:00
Xiao Ma
332338bd75 Add getInterfaceList module-lib API in EthernetManager.
Bug: 171872016
Test: m
Merged-In: Ib0e6c8f67c6ded7d17bb9e0ff49e7ff495c8819d
Change-Id: I94fd147d0f8cf09cb7445fd2b5bc8e4528e8390e
2022-03-22 13:59:40 +00:00
markchien
5912ab6906 Add setEthernetEnabled and its listener API
Bug: 171872016
Test: atest EthernetServiceTests

Merged-In: Iefd24d955572589c5bd3ca9a8139ea6e44979e8a
Change-Id: Iefd24d955572589c5bd3ca9a8139ea6e44979e8a
2022-03-22 13:58:14 +00:00
markchien
c854d709b3 Add setEthernetEnabled and its listener API
Bug: 171872016
Test: atest EthernetServiceTests

Merged-In: Iefd24d955572589c5bd3ca9a8139ea6e44979e8a
Change-Id: Iefd24d955572589c5bd3ca9a8139ea6e44979e8a
2022-03-22 13:58:14 +00:00
Aaron Huang
286f4e2c88 Merge "Fix proto invalid write type" 2022-03-22 12:18:39 +00:00
Aaron Huang
0066692a4e Merge "Fix proto invalid write type" 2022-03-22 12:18:39 +00:00
Patrick Rohr
3879cf1a78 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
Merged-In: I3361ad0e01e761ffd77faf6c55924fa4612ede90
Change-Id: I3361ad0e01e761ffd77faf6c55924fa4612ede90
2022-03-22 12:12:48 +00:00
Patrick Rohr
f428211259 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
Merged-In: I3361ad0e01e761ffd77faf6c55924fa4612ede90
Change-Id: I3361ad0e01e761ffd77faf6c55924fa4612ede90
2022-03-22 12:12:48 +00:00
Patrick Rohr
a873f582a1 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
Merged-In: I0f2866d09b745e7bdb261a1258f94cfd51223a8f
Change-Id: I0f2866d09b745e7bdb261a1258f94cfd51223a8f
2022-03-22 10:00:50 +00:00