Commit graph android_packages_modules_Co.../framework-t
Message SHA1
Merge "Fix NullPointerException happens in dumpCheckin" am: 6b7e457988 am: 44a02af11a am: a4d60dd2ad
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059628

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

Aaron Huang   authored and   Automerger Merge Worker   commited 2022-04-20 06:12:50 +00:00
d79f543df0
Merge "Fix NetworkTemplate generates non-metered carrier template" am: 481b2649f7 am: d3a90fb206 am: e6616d1c7c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2064758

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

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-04-20 06:08:16 +00:00
57fc24937a
Merge "Fix NullPointerException happens in dumpCheckin"
Aaron Huang   authored and   Gerrit Code Review   commited 2022-04-19 11:43:21 +00:00
6b7e457988
Merge "Fix NetworkTemplate generates non-metered carrier template"
Junyu Lai   authored and   Gerrit Code Review   commited 2022-04-19 10:18:26 +00:00
481b2649f7
Fix NullPointerException happens in dumpCheckin
Currently dumpCheckin passes a null object to create
the contructor of NetworkStatsCollection.Key but the
constructor requires non-null object. Thus, it caused
the NPE in dumpCheckin. To fix this exception, create
an NetworkIdentitySet() object instead of using an
null object.

Bug: 225131008
Bug: 226539404
Test: dumpsys netstats --checkin is fine
      FrameworksNetTests
Change-Id: I7f2dadf0647b3f42e0f667d96291d2ae37e23faf

Aaron Huang   commited 2022-04-19 17:49:30 +08:00
c3a43b4063
Fix NetworkTemplate generates non-metered carrier template
From current design, NetworkPolicyManagerService should only
creates metered carrier/mobile templates. However, if someone
calls the hidden API interface or the template was created
before NetworkTemplate#Builder is published. The caller may
create a non-metered carrier template and persist into the
storage.

This CL elimates this possibility and mark non-metered carrier
template non-persistable, so devices could auto-recover from
this symptom after reboot.

Fix: 222382637
Test: TH
Change-Id: I5265e371b0126ce65c32fb09a6e04223afb3d286

Junyu Lai   commited 2022-04-18 16:41:54 +08:00
74f7c8c907
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.

Test: TH
Fix: 225168182
  (cherry-picked from ag/17397294)
Change-Id: Ia7fdf8d31a96a26b0bf1682f462292b051560477
Merged-In: Ia7fdf8d31a96a26b0bf1682f462292b051560477

junyulai   commited 2022-04-11 18:45:36 +08:00
0f54d64db2
[MS83.2] Make some APIs module-lib instead of system current
Test: m
Fix: 217479745
  (cherry-picked from ag/17118003)
Change-Id: Ief3f2304f11b7940a18b98b8533fbca85ffa4dc1
Merged-In: Ief3f2304f11b7940a18b98b8533fbca85ffa4dc1

junyulai   commited 2022-04-11 18:44:37 +08:00
dd1d02415d
[MS83.1] Make some APIs module-lib instead of system current
Some of the internal classes are not available for priv-apps.
Thus, make them module-lib instead.

This change also adds some nullability annotations for existing
APIs according to go/android-api-guidelines.

Test: m
Test: m frameworks-base-api-system-current-compat
Fix: 217479745
  (cherry-picked from ag/17117903)
Change-Id: I18de46b11df7232ab82b9465856fdde621283156
Merged-In: I18de46b11df7232ab82b9465856fdde621283156
Merged-In: Ief3f2304f11b7940a18b98b8533fbca85ffa4dc1

junyulai   commited 2022-04-11 18:44:20 +08:00
44e61e2140
Merge "Remove unused empty filegroups from connectivityT package." am: 8e13391915 am: 06a82b4d0b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2050858

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

Xiao Ma   authored and   Automerger Merge Worker   commited 2022-04-07 04:23:14 +00:00
36f18ff9a4
Merge "Remove unused empty filegroups from connectivityT package." am: 8e13391915
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2050858

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

Xiao Ma   authored and   Automerger Merge Worker   commited 2022-04-07 04:01:53 +00:00
06a82b4d0b
Merge "Remove unused empty filegroups from connectivityT package."
Xiao Ma   authored and   Gerrit Code Review   commited 2022-04-07 03:45:45 +00:00
8e13391915
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>

Paul Hu   authored and   Automerger Merge Worker   commited 2022-04-07 03:10:55 +00:00
ac780d3bd0
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>

Paul Hu   authored and   Automerger Merge Worker   commited 2022-04-07 02:42:02 +00:00
06e59627bb
Merge changes from topic "MDns_AIDL"
* changes:
  Use MDns aidl on NsdService
  Add MDnsManager

Paul Hu   authored and   Gerrit Code Review   commited 2022-04-07 02:06:35 +00:00
09475308b7
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>

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2022-04-06 01:20:45 +00:00
8a43622447
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>

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2022-04-06 00:58:44 +00:00
ec84e33d10
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

paulhu   commited 2022-04-04 15:18:27 +00:00
2b9ed95ae5
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

paulhu   commited 2022-04-04 15:02:17 +00:00
541b72d03b
Address EthernetManager javadoc review comments
Test: TH
Change-Id: Iafa8979d8e96ea4d078b017e56ee61334d33b5f5

Patrick Rohr   commited 2022-04-04 14:59:42 +02:00
50c470e308
Update javadoc to match expectation for UnsupportedOperationException
Test: builds
Change-Id: I44eac15972ed099fc12599a78a71557a7b16d593

Patrick Rohr   commited 2022-04-04 14:59:42 +02:00
0f2cbe92f1
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

Xiao Ma   commited 2022-04-04 07:00:59 +00:00
f90f1efff4
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

Xinyi Zhou   commited 2022-03-31 23:48:15 -07:00
85c3e0883c
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

Patrick Rohr   commited 2022-03-31 16:12:14 +02:00
cc97aed683
Remove Fast Pair system APIs.
Bug: 227513829
Test: cts test
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I21b33cb8dcb7f6eee1ecc39115fc153e9a975e7c

Chun Zhang   authored and   Eric Lin   commited 2022-03-31 02:32:03 +00:00
74607dd786
Merge "Improve the comments of getMedium." into tm-dev
Wei Wang   authored and   Android (Google) Code Review   commited 2022-03-30 20:56:45 +00:00
06daa43e83
Merge "Make some NetworkStats APIs system-current" into tm-dev
Junyu Lai   authored and   Android (Google) Code Review   commited 2022-03-30 09:38:21 +00:00
b10a2db32f
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

junyulai   authored and   Junyu Lai   commited 2022-03-30 09:38:11 +00:00
6801690383
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

Wei Wang   commited 2022-03-29 17:14:35 -07:00
f5bb26fed8
Remove unused system apis.
Test: CTS
Bug: 204780849
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ifb09499f600450c43a8f8b56354e646d38a108e7

Chun Zhang   commited 2022-03-29 16:21:42 -07:00
e4440de521
Merge "Require Permission Manifest.permission.WRITE_SECURE_SETTINGS on setFastPairScanEnabled API." into tm-dev
Chun Zhang   authored and   Android (Google) Code Review   commited 2022-03-25 23:47:54 +00:00
5ab2a85492
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

Remi NGUYEN VAN   commited 2022-03-25 14:58:43 +00:00
0395b70000
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

Remi NGUYEN VAN   commited 2022-03-25 11:02:45 +00:00
700ffc994f
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

Remi NGUYEN VAN   commited 2022-03-25 09:47:23 +00:00
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: I1fe5091361c7766dc7b6b4fb8c7b62d403e950bb
Change-Id: If738f607be84b3d7e2045a83a4d2976ed0d4e188

Remi NGUYEN VAN   commited 2022-03-25 09:46:39 +00:00
af582a015b
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

Chun Zhang   commited 2022-03-25 04:27:22 +00:00
32a93a5ce6
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

Remi NGUYEN VAN   commited 2022-03-24 14:40:07 +00:00
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
Merged-In: I1fe5091361c7766dc7b6b4fb8c7b62d403e950bb
Change-Id: Ib592434ff50c06e25894f6ed7d7e3e8e1e3ea67b

Remi NGUYEN VAN   commited 2022-03-24 14:19:13 +00:00
3464805acc
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

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-03-24 06:32:05 +00:00
d1b7de70a1
Merge "Fix ethernet enable / disable API" am: 04f9843d32
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2029245

Change-Id: I453e0833654f71d430727444df959c22929d72b9

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-03-24 06:30:25 +00:00
85780a92a2
Merge "Add getInterfaceList module-lib API in EthernetManager."
Patrick Rohr   authored and   Gerrit Code Review   commited 2022-03-24 06:15:43 +00:00
e38626a4a2
Merge "Update the module-lib API txt with getInterfaceList api."
Patrick Rohr   authored and   Gerrit Code Review   commited 2022-03-24 06:15:43 +00:00
f7c4dcaaf4
Merge "Add getInterfaceList module-lib API in EthernetManager."
Patrick Rohr   authored and   Gerrit Code Review   commited 2022-03-24 06:15:43 +00:00
589873fcba
Merge "Fix ethernet enable / disable API"
Patrick Rohr   authored and   Gerrit Code Review   commited 2022-03-24 06:09:28 +00:00
04f9843d32
Merge "Fix ethernet enable / disable API"
Patrick Rohr   authored and   Gerrit Code Review   commited 2022-03-24 06:09:28 +00:00
95738f7c18
Merge "Fix ethernet enable / disable API"
Patrick Rohr   authored and   Gerrit Code Review   commited 2022-03-24 06:09:28 +00:00
24f7b378c2
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-03-23 20:00:21 +00:00
420d7f14b1
Resolve API council feedback
Test: built and verified logs
Fix: 225116248
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ic30aee650fd41287d3a363491fa602cd990467a8

Xinyi Zhou   commited 2022-03-23 19:05:29 +00:00
1b2a5bf724
Update the module-lib API txt with getInterfaceList api.
Bug: 171872016
Test: m
Merged-In: I16c69aa0d236036a600bdae9fb8326ff70fd4fda
Change-Id: I1ee2ad76b4950906516fae7328785b8c583f7adb

Xiao Ma   commited 2022-03-23 15:18:24 +00:00
bdfed34bbc
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

Patrick Rohr   commited 2022-03-23 11:45:06 +00:00
37f302e109