Commit Graph

928 Commits

Author SHA1 Message Date
Junyu Lai
2c12f922de Do not crash when passing null into buildTemplateMobileAll
Test: atest FrameworksNetTests:android.net.connectivity.android.net.NetworkTemplateTest
Test: atest FrameworksNetTests:android.net.connectivity.android.net.netstats.NetworkTemplateTest
Bug: 273963543
Change-Id: I0a8f94df124147e92d35cf474b3d69d1dee6902c
2023-03-30 13:59:02 +08:00
Treehugger Robot
ca2dc5fccd Merge "Add androidx.annotation_annotation library" am: 9d5066b806 am: 41d8502be9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2501921

Change-Id: If0e399b4632f5f1e451970aa46487f219c41ce80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 02:18:04 +00:00
Treehugger Robot
9d5066b806 Merge "Add androidx.annotation_annotation library" 2023-03-28 01:14:42 +00:00
Xinyi Zhou
0d195ae5d4 Add androidx.annotation_annotation library
Change-Id: Ia8b745d674262a312044cd4e2b4320917d550725
Test: TH
Bug: 272150669
2023-03-24 05:40:37 +00:00
Remi NGUYEN VAN
ca877a8ed0 Merge "Add back @hide NetworkTemplate methods" am: 123595655a am: 256d304921
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2500322

Change-Id: I706df010b554d0db5f25cb7ba66ba55fa6309b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 04:09:18 +00:00
Remi NGUYEN VAN
123595655a Merge "Add back @hide NetworkTemplate methods" 2023-03-24 03:37:24 +00:00
Remi NGUYEN VAN
37c4a9f222 Add back @hide NetworkTemplate methods
Add back methods that were removed in recent refactoring
(aosp/2286634).  Even though they are fully @hide, some usage by
an OEM has been found on T.

Test: atest; the methods should be unused except on the OEM device
Change-Id: Icd67fb8b7e63cc131356a30a3044458ae2f5efff
2023-03-23 18:49:28 +09:00
Cole Faust
e49c11d884 Cleanup visibility of framework-connectivity-t.impl
Fixes: 274725920
Test: Presubmits
Change-Id: I325f686af34720cddbbc63580edec8477a9acc45
2023-03-22 14:19:02 -07:00
Paul Hu
5c28b172f7 Merge "Add a CompatChange flag to enable platform backend" am: 62503cfef1 am: fa2a4f33d9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2452427

Change-Id: I8211177f9cef3b2a36ab5e00a34d77346693e5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 14:24:13 +00:00
Paul Hu
62503cfef1 Merge "Add a CompatChange flag to enable platform backend" 2023-03-17 13:14:19 +00:00
Paul Hu
2e0a88c0fa Add a CompatChange flag to enable platform backend
Apps targeting sdk < U are considered to use a legacy native
daemon as NsdManager backend, but other apps use a
platform-integration mDNS implementation as backend. So add a
CompatChange flag to enable platform backend for non-legacy
apps.

Bug: 270306772
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I7ba58f8a5186fb49ad5f8aeacc8b8234bef1eabe
2023-03-17 09:10:46 +08:00
Anton Hansson
893cd2592c Merge "Use filegroup defaults for framework sources" am: 41ad986490 am: 2b246a30df
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2489555

Change-Id: Ia00a74bb0665cda921f8ab8194c4e0dfced721be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 10:01:06 +00:00
Anton Hansson
57f3d69fd5 Use filegroup defaults for framework sources
There's now a shared defaults module for this kind of filegroup. Use
that and remove the previously duplicated prop.

Bug: 271816210
Test: m
Change-Id: Ia4547984a73179fdfc98c427482dd10246f9722c
2023-03-15 10:36:52 +00:00
Junyu Lai
e7117ea1fc Merge "Remove requireNonNull check from matchesWifiNetworkKey" am: 7ee63b6895 am: c06b45d89f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2421141

Change-Id: I22a02d2a7217a96441510c691c6d104c0d575260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 10:05:08 +00:00
Junyu Lai
7ee63b6895 Merge "Remove requireNonNull check from matchesWifiNetworkKey" 2023-03-09 09:13:40 +00:00
Paul Hu
649aefc156 Merge "Migrate reigster service callback backend" am: ee0e6cd701 am: 5b610505d0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2424806

Change-Id: Ie0cdd0b32a01cd0d855493277f2debb863591d41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 11:29:16 +00:00
Paul Hu
ee0e6cd701 Merge "Migrate reigster service callback backend" 2023-03-08 10:27:57 +00:00
Aaron Huang
8ac1143594 Remove requireNonNull check from matchesWifiNetworkKey
matchesWifiNetworkKey expects a non-null value of the
wifiNetworkKey, however, it might be null in practice
and the null wifiNetworkKey will be stored into disk.
And then when the matchesWifiNetworkKey is called, the
requireNonNull will crash the system. Thus, remove the
requireNonNull from matchesWifiNetworkKey to avoid
system crash and handle if the wifiNetworkKey is null
then it should not match a template with non-empty
mMatchWifiNetworkKeys.

Check if WifiInfo contains a null network key then skip it
to prevent adding the identity to the network identity set.
Also, add a Log.wtf when setWifiNetworkKey(info.getNetworkKey()),
this might be useful to catch why the wifiNetworkKey is
null.

Bug: 267815242
Bug: 266598304
Test: FrmeworksNetTests
Change-Id: I9c21f7e3dca9482133c7e331741cf808105414e9
2023-03-07 18:16:55 +08:00
Cole Faust
41228921c1 Compile HalfSheetUX against framework-connectivity-t.impl
HalfSheetUX uses private apis of framework-connectivity-t. It appears
that using just "framework-connectivity-t" will compile against either
the stubs or source of framework-connectivity-t depending on if the
module was included in the same apex as it or not.

aosp/2462194 is adding the ability to compile modules like HalfSheetUX
outside of the context of the apex, at which point it will start
compiling against stubs if we don't explicetly specify to use the
implementation library.

Bug: 254205429
Test: m javac-check with aosp/2462194
Change-Id: I1d41e47aa0e4e3d320b78b28cfc181fc30c4537c
Merged-In: I1d41e47aa0e4e3d320b78b28cfc181fc30c4537c
2023-03-06 23:15:49 +00:00
Cole Faust
c944f10f61 Compile HalfSheetUX against framework-connectivity-t.impl
HalfSheetUX uses private apis of framework-connectivity-t. It appears
that using just "framework-connectivity-t" will compile against either
the stubs or source of framework-connectivity-t depending on if the
module was included in the same apex as it or not.

aosp/2462194 is adding the ability to compile modules like HalfSheetUX
outside of the context of the apex, at which point it will start
compiling against stubs if we don't explicetly specify to use the
implementation library.

Bug: 254205429
Test: m javac-check with aosp/2462194
Change-Id: I1d41e47aa0e4e3d320b78b28cfc181fc30c4537c
Merged-In: I1d41e47aa0e4e3d320b78b28cfc181fc30c4537c
2023-03-06 15:14:40 -08:00
Paul Hu
30bd70d168 Migrate reigster service callback backend
registerServiceInfoCallback currently only sends updates for
addresses added, but does not handle removes (expiration) and
TXT/SRV record updates. Thus, migrate its backend to
MdnsDiscoveryManager which can support the expiration update.

Bug: 266030646
Test: atest FrameworksNetTests CteNetTestCases
Change-Id: I72add213935dc1beacb6277007868ad30bd89c00
2023-03-06 13:49:19 +08:00
Junyu Lai
42bb19ea5a Merge changes I197fbfb8,I6375e771,I48536927 am: d3e793d8a1 am: 9cee333939
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2465771

Change-Id: I6f4164c68b964cfe5e6741cf3fe60db1d4467ac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:58:32 +00:00
Junyu Lai
d3e793d8a1 Merge changes I197fbfb8,I6375e771,I48536927
* changes:
  Add constructor which used by Android T CTS
  Delete testUnsupportedAppUsageConstructor from coverage test
  Add some hidden APIs back to NetworkTemplate
2023-03-03 09:34:47 +00:00
Junyu Lai
84b5936e3d Add constructor which used by Android T CTS
aosp/2241257 and aosp/2241058 are included in the mainline train
release and it causes the T device can’t pass CTS-13_R2/CTS-13_R3.
It’s because some parameters of the constructor have been removed.

Add it back to keep backward compatibility.

Test: 1. atest CtsNetTestCases:android.net.netstats.NetworkTemplateTest
      2. CTS-13_R3
Fix: 269974916
Fix: 269834366
Change-Id: I197fbfb8419e4d4885a97a93a71f13d33c3f02da
2023-03-03 15:16:36 +08:00
Aaron Huang
960c6267ca Add some hidden APIs back to NetworkTemplate
Since there's a bug about apps still call hidden
APIs, it's likely some developers might build apps
against hidden API.
To be safe, add these methods back to avoid apps
crash. These methods are still in
hiddenapi-max-target-o-low-priority.txt, so they
should not be removed without considering hidden
API usage. Removing hidden API in general isn't
forbidden, but the ones listed in hiddenapi usage
need extra care.

Bug: 269178029
Test: 1. atest CtsNetTestCases:android.net.netstats.NetworkTemplateTest
      2. CTS-13_R3
Change-Id: I485369274ccacd314230e3d267df665d8083bf97
2023-03-03 13:54:42 +08:00
Junyu Lai
2aa87ac72c Merge "Clear calling identity before calling into DPM" am: ae04a1a842 am: 0f4f9dc068
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2445864

Change-Id: I58cd2c61217b9673e4da77ca4d86f0a93e6af756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 07:31:01 +00:00
Junyu Lai
ae04a1a842 Merge "Clear calling identity before calling into DPM" 2023-03-02 05:56:51 +00:00
Junyu Lai
09330c436e Clear calling identity before calling into DPM
Test: 1. manual test with test app
      2. atest CtsNetTestCases:android.net.cts.NetworkStatsManagerTest
Fix: 249920382
Fix: 269561252
Change-Id: I4af7fd640d551be3ef62ea248e58bf8bae5e0b87
2023-03-01 15:56:59 +08:00
Aaron Huang
13318e276e Merge "Add isMatchRuleMobile back" am: 9ff2fe7747 am: 0d3e843bb2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2444979

Change-Id: Idfd3a2f9359cf9fb7414ce048c079bae2424b420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 06:50:35 +00:00
Aaron Huang
9ff2fe7747 Merge "Add isMatchRuleMobile back" 2023-02-24 05:30:06 +00:00
Aaron Huang
30814f780e Merge "Fix backward compatibility issue for removed wildcard match rule" am: dbdb1d972c am: 4b5dca4216
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2424491

Change-Id: Ie035be35becd9d8d50cd4c1f2a31fd8e77bdb2b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 08:56:43 +00:00
Aaron Huang
dc97905786 Add isMatchRuleMobile back
There's a user still call this method which causes the app
crash and it might be the app was built against hidden API.
The bug was observed after updating the mainline module so
adding this method back to the module to avoid apps crash
due to the method is not found in NetworkTemplate.

Bug: 269178029
Test: build
Change-Id: I06dc694b1ce060488135f5d34138f14abd50ad32
2023-02-21 17:23:48 +08:00
Aaron Huang
69086d6cbc Fix backward compatibility issue for removed wildcard match rule
A template with type MATCH_MOBILE could have empty subscriber
IDs but it should not contain one of subscriber IDs is null.

An app might still build a template through the constructor
which is annotated with @UnsupportedAppUsage. NetworkTemplate
will throw an exception when the app trying to construct a
template with type *_WILDCARD. The constructor should be
backward compatible with old version so this change is to add
the backward compatibility to have NetworkTemplate not throw
an exception.

Bug: 267701889
Test: FrameworksNetTests
Change-Id: I23a607dae508e0c53520e2edf187cb611ed36b68
2023-02-21 14:07:15 +08:00
Xinyi Zhou
960d69d821 Revert "Add back getFastPairScanEnabled and setFastPairScanEnabled System API"
This reverts commit 4af0e0f784.

Reason for revert: not support the feature anymore

Test: -m
Change-Id: I26c1f1dd5f36ecb6c1386ccf6ec84118fd93017d
2023-02-14 20:16:56 +00:00
Chun Zhang
4aad023afb Revert "Revert "Remove Fast Pair system APIs.""
This reverts commit f6f8c64989.

Reason for revert: not pass PWG review

Change-Id: Ie6c7536c45d53cc4da31811a19fff6ee23852eef
Bug: 239750900
2023-02-14 16:24:37 +00:00
Xinyi Zhou
75200b1999 [API] Add “ERROR_” prefix for consistency with others
Test: -m
Fix: 268195420
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ia9b58c8d134669de36094254270547629a92192a
2023-02-12 06:22:51 +00:00
Aaron Huang
7ec1dc69e5 Merge "Tempates with different subscriber ID should be not equal" am: 2a69e41772 am: d7bab82b9c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2422785

Change-Id: Ica5009ec31b3400422453247786cf56f22a83a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 09:10:49 +00:00
Aaron Huang
2a69e41772 Merge "Tempates with different subscriber ID should be not equal" 2023-02-10 08:06:07 +00:00
Aaron Huang
c9371d05fe Tempates with different subscriber ID should be not equal
mSubscriberId was removed from NetworkTemplate and equals/hashCode
does not check the mMatchSubscriberIds. This will cause tempates
with different subscriber ID matching that are equal now. Thus
adding the check for mMatchSubscriberIds to fix it.

Bug: 267968247
Test: FrameworksNetTests:NetworkTemplateTest
Change-Id: I2956bf4c8cf2c4d73ebe102d53e755fbcc5d7642
2023-02-10 08:04:53 +00:00
Yuyang Huang
711c453fd4 Merge "Moves all compatibility flags to ConnectivityCompatChanges.java" am: 985534c95b am: ca4ab86275
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428795

Change-Id: I28c75a9aa435a8fb8d9d13b8dd13164ef17857bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 02:55:46 +00:00
Yuyang Huang
90a2cbdd8d Moves all compatibility flags to ConnectivityCompatChanges.java
ConnectivityCompatChanges.java becomes the centralized place for all the
CompatChanges used in the Connectivity module. By putting all the
CompatChanges here, we are able to manage them under a single
platform_compat_config.

Bug: 268440216
Test: atest FrameworksNetTests
Change-Id: I3e17af545718073d7d1c96e27298e7790563fd33
2023-02-09 19:51:37 +09:00
Paul Hu
fbabe92853 Merge "Rename onResolveStopped to onResolutionStopped" am: e3e9f5622b am: 7fde5f49e4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2405718

Change-Id: Ibd68cebb5926a15ac17c9953955e973534ff93ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 12:08:54 +00:00
Xinyi Zhou
5f5f292cf6 [API] Add more error codes
go/presence_api_u

Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
Fix: 265353983
Change-Id: I0c1fd8ff72c0f52189330a471b5ff5865a3446b4
2023-02-03 23:07:21 +00:00
Xinyi Zhou
8fe45419d0 [API] Add offloadOnly API
go/presence_api_u

Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
Bug: 265353983
Change-Id: Ib423285439ec62949ae59487081164b44f1580a6
2023-02-01 15:11:06 -08:00
Xinyi Zhou
e73c76f9c3 [API] Upadate queryOffloadCapability API
go/presence_api_u

Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
Bug: 265353983
Change-Id: Ic7e95cf0f65c3eb60d8b08d402ac56783821bac1
2023-02-01 14:59:08 -08:00
Paul Hu
b2c0f3407f Rename onResolveStopped to onResolutionStopped
Rename the method onResolveStopped(NsdServiceInfo) to
onResolutionStopped(NsdServiceInfo) for consistency as API
review feedback.

Bug: 266811051
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I788b5903ecaf78a9aa960dd3b7413a22f171c72f
2023-01-30 08:53:15 +00:00
Remi NGUYEN VAN
247e8cefb1 Merge "New API to listen service update" am: 93587f609b am: d6cb8c860e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2369709

Change-Id: Id3beede74d6e60d4d4182e7da6da07084ca5cc06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 16:30:25 +00:00
Paul Hu
18aecccc9d New API to listen service update
Currently, the resolution is a one shot query, it only notifies
the first finding service information. There is no way to listen
the service update. Thus, add a new API that can register a
callback to listen to the service updates continuously.

Bug: 245369943
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I0e9d92b9028375feb3e344ab6c4acb515c5b2be9
2023-01-19 20:16:03 +09:00
Remi NGUYEN VAN
113d648e76 Merge "New API to stop service resolution" am: fd02056713 am: b5ae95a4d1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2369237

Change-Id: I76c20d5cfd96027c1f20c3011b78fd3546865855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 02:51:06 +00:00
Xinyi Zhou
7ada57515a Merge "[API] Add Offload Callback API" 2023-01-18 21:25:58 +00:00