Commit Graph

3464 Commits

Author SHA1 Message Date
Anton Hansson
2c592f0df3 Merge "Remove build workaround for wifi stubs" into rvc-dev 2020-03-31 19:42:28 +00:00
Anton Hansson
2e53a5302b Add wifi util lib to classpath for wifi stubs
Fixes the individual wifi stubs to match those in the monolithic
current.txt.

Bug: 152857194
Test: diff <(cat api/system-current.txt | grep 'class RttManager {' -A30) \
           <(cat wifi/api/system-current.txt | grep 'class RttManager {' -A30) \
      && echo pass || echo fail
Change-Id: I3fc8a87e83f8dfee8d97966ead379d7acf0807bc
2020-03-31 15:45:00 +01:00
Anton Hansson
8256aad305 Remove build workaround for wifi stubs
b/151134996 is fixed now.

Bug: 151134996
Test: m framework-wifi-stubs-publicapi
Change-Id: Ia5c07faaca18c663d02c705aca0a7b7622a95e5f
2020-03-30 14:17:35 +01:00
Chalard Jean
996492f866 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
  Update the NetworkProvider API for council comments
2020-03-27 22:50:42 +00:00
Chalard Jean
2da4f9f9ae Rename satisfiedBy into canBeSatisfiedBy
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
2020-03-27 23:46:30 +09:00
Artur Satayev
8612937cb6 Remove unsupportedappusage-annotation library.
It is not needed anymore, and is replaced by "unsupportedappusage" library.

Bug: 145132366
Test: m
Change-Id: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Merged-In: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Exempt-From-Owner-Approval: clean up
2020-03-26 14:40:16 +00:00
Les Lee
d6f3212620 Merge "wifi: Support setBssid for tethered mode hotspot" into rvc-dev 2020-03-26 00:23:14 +00:00
Nate Jiang
0ccefbe94b Merge "Keep most recently connection network flag" into rvc-dev 2020-03-25 18:10:13 +00:00
Anton Hansson
3544feedb7 Merge "Make framework-wifi stubs use the new defaults" into rvc-dev 2020-03-25 13:21:40 +00:00
Anton Hansson
013dc72801 Make framework-wifi stubs use the new defaults
Makes it convenient to change all stubs from a central place.

Bug: 149293194
Test: m framework-wifi-stubs{public,system,module_libs_}api
Change-Id: Ie857558b507c90dd46a7777c82f14d7d45422222
2020-03-24 19:50:06 +00:00
David Su
9c493f4722 Merge "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds" into rvc-dev 2020-03-24 19:14:07 +00:00
lesl
b1c47a7641 wifi: Support setBssid for tethered mode hotspot
PS: Remove BSSID convert to WifiConfiguration since BSSID field doesn't
use in WifiConfiguration usage on SoftAp.

Bug: 152180102
Test: atest frameworks/base/wifi/test/
Change-Id: Id781ff6af222fe1d557560feaa44b5d2761c3a81
2020-03-24 21:26:31 +08:00
Roshan Pius
5f176bf91e Merge "WifiMigration: Add a settings key to indicate migration is complete" into rvc-dev 2020-03-24 05:11:50 +00:00
Roshan Pius
849a6f78a5 WifiMigration: Add a settings key to indicate migration is complete
Bug: 151888061
Test: Manual verification (ensured that this method returns null after
first reboot)

Change-Id: Ie8ad397c7b68e35cfa7b696ef22d84f376cf3fe7
2020-03-23 18:48:28 -07:00
David Su
87d6a79f2f frameworks/base/wifi/tests: Run mts-wifi on AOSP builds
This is a temporary workaround for mts-wifi to
run on AOSP builds, since on those devices the
Wifi package name is `com.android.wifi` and not
`com.google.android.wifi`.

Bug: 151836001
Test: continuous runs
Change-Id: I11baae67e10638acd8c24ae0fab92e5b2bfca6e4
2020-03-23 16:14:54 -07:00
Vladimir Marko
82f2060f55 Merge "Add permitted_packages to framework-wifi." into rvc-dev 2020-03-23 20:43:18 +00:00
TreeHugger Robot
162db72a8a Merge "WifiMigration: Add sample config store XML files" into rvc-dev 2020-03-20 23:02:58 +00:00
Michael Wright
b99ba10bec Merge "Make ScanResult final." into rvc-dev 2020-03-20 19:02:10 +00:00
Roshan Pius
da0704b275 WifiMigration: Add sample config store XML files
Also, added a readme to list the different sample files.

Bug: 152048434
Test: Compiles
Change-Id: If15ec11fd36b327ac4942f97a49ff04abc1cbd0f
2020-03-20 11:57:48 -07:00
Vladimir Marko
8a71e9b9e3 Add permitted_packages to framework-wifi.
Test: m out/soong/.intermediates/frameworks/base/wifi/framework-wifi/android_common/package-check.stamp
Bug: 151314205
Change-Id: If04aa602c2e628243fe6cb3545db912a1179c5d5
2020-03-20 11:32:54 +00:00
David Su
70cd6d61e3 Merge "Remove WifiManager.getTxPacketCount" into rvc-dev 2020-03-19 23:59:14 +00:00
David Su
15c3b29222 Remove WifiManager.getTxPacketCount
This is no longer called by CTS, and has no other
clients.

This also removes the dependency on
WifiNl80211Manager.getTxPacketCounters(), so it
will no longer need test coverage.

Bug: 150978929
Test: atest FrameworksWifiApiTests
Change-Id: Ia64a6b2f5009c021ed7dd66c24e854996995778a
2020-03-19 12:51:02 -07:00
Nate Jiang
ca5ea6ca40 Merge "Set metered bit for passpoint networkSuggesiton" into rvc-dev 2020-03-19 17:16:09 +00:00
Roshan Pius
aa6527cf41 WifiMigration: Add helper to perform softap.conf to XML conversion
For softap configuration, we need to perform 2 levels of conversion:
a) AOSP softap.conf format to AOSP WifiConfigStoreSoftap.xml format
b) OEM specific customization to AOSP WifiConfigStoreSoftAp.xml format.

Moving a) from within the wifi stack to WifiMigration to allow OEM's to
adapt their customizations to the legacy conf files for b).

Bug: 149418926
Test: atest android.net.wifi
Test: Device boots up and able to turn on hotspot.
Test: Manual tests:
a) Flash Q build
b) Add hotspot config
c) Upgrade to RVC build with this CL.
d) Ensure all data has migrated over.
e) Modified hotspot config and reboot.
f) Ensured old data has not migrated over.

Change-Id: I6d900bd621873a0df81aaa17cf46ed153b073289
2020-03-18 15:38:49 -07:00
Nate Jiang
65c2b809f7 Set metered bit for passpoint networkSuggesiton
Bug: 151672224
Test: atest android.net.wifi
Change-Id: Icc850c37e84c9123ae96abaf377bbf68bd00dae6
2020-03-18 15:29:01 -07:00
Michael Wright
0e0734c773 Make ScanResult final.
While normally this would be a breaking API change, since we never
actually exposed a constructor for this class it's safe to mark it as
final.

Bug: 149912516
Test: Builds
Change-Id: I5555a17d98ebe8c61064ef64e508f707aff4eeb7
2020-03-18 20:07:05 +00:00
Anton Hansson
dc033c35c0 Add individual API tracking files for modules
This adds metalava api tracking generation to the module
stub rules, to make sure we know exactly what API a
particular module stub exports.

Bug: 147768409
Test: m update-api
Exempt-From-Owner-Approval: Approved in master
Change-Id: Iaf2ef5b5751eb208d119ddbc74481239366fe581
Merged-In: Iaf2ef5b5751eb208d119ddbc74481239366fe581
2020-03-18 11:03:12 +00:00
Roshan Pius
9144141d32 Merge "WifiMigration: Add new API's for migrating config store data" into rvc-dev 2020-03-18 05:20:04 +00:00
Roshan Pius
5cdc892562 WifiMigration: Add new API's for migrating config store data
The new API's should be modified by the OEM's to convert their existing
config store file to AOSP format. wifi mainline module will
delete/rename the file after migrating data out of it. Subsequent
invocations of these API's should return null.

Bug: 149418926
Test: Compiles
Change-Id: I9ef0986fd38ea5ba9555c7c4652b90cf2ac2fb91
2020-03-17 19:37:21 -07:00
David Su
8ad736720c Merge "Build framework-wifi against module_current" into rvc-dev 2020-03-17 22:36:17 +00:00
Nate Jiang
c6b1646265 Keep most recently connection network flag
Bug: 150799593
Test: atest com.net.android.wifi
Change-Id: I83fe6913b32459a90bf4ebb08b6f24cd01c4d01b
2020-03-16 17:29:11 -07:00
Roshan Pius
75fb6e3c57 Merge "WifiMigration: Remove loadFromConfigStore & removeConfigStore" into rvc-dev 2020-03-17 00:26:28 +00:00
David Su
3c0d19766b Build framework-wifi against module_current
framework-wifi now exclusively builds against
formal APIs.

Bug: 140299412
Test: boots up and connects to Wifi
Change-Id: I537d030b349158a8dceb1b018bfff63b123456cf
2020-03-16 15:53:48 -07:00
Roshan Pius
ee09b28217 WifiMigration: Remove loadFromConfigStore & removeConfigStore
In preparation of moving away from this API surface to a different
mechanism.

Bug: 149418926
Test: Device boots up and connects to wifi networks.
Change-Id: Iaa27ea7b69694d41d900fc39116ad2a43d8f8bfa
2020-03-16 14:16:43 -07:00
Steven Liu
97f25c93fd Remove legacy "Carrier Wi-Fi" configuration constants.
They are deprecated and replaced by direct calls to the Suggestion API.

Bug: 144431927
Test: atest android.net.wifi
Change-Id: I89665bc3e891b3a0fb58be10ccb1642ec121e29b
2020-03-16 13:01:27 -07:00
Nate Jiang
81eabccd8c Merge "Remove untrusted network flag from suggestion" into rvc-dev 2020-03-16 16:58:06 +00:00
George Chang
88582cf484 Revert "Wifi: Fix API documentation for isWifiStandardSupported"
This reverts commit e5f6a8d7bb.

Bug: 151586035
Reason for revert: build break

Change-Id: I4ee7366b88e10910c1bc4b1f192f66000d8e40e3
2020-03-16 08:15:11 +00:00
Ahmed ElArabawy
e5f6a8d7bb Wifi: Fix API documentation for isWifiStandardSupported
This commit fixes a typo in the api documentation for the
WifiManager#isWifiStandardSupported()

Bug: 151577071
Test: None
Change-Id: Icfd3c8d0a46314ad48091d2e71f62a75d9df8cfb
2020-03-16 05:56:54 +00:00
Nate Jiang
69540df324 Merge "Set untrusted bit when create WIfiConfig" into rvc-dev 2020-03-16 00:57:14 +00:00
Hai Shalom
c063140b6f Merge "[Passpoint] Fix credential unique ID calculation" into rvc-dev 2020-03-14 14:37:50 +00:00
Hai Shalom
f88368556d [Passpoint] Fix credential unique ID calculation
Fix credential unique ID to allow multiple instances of same
credential type.

Bug: 151478195
Test: atest CredentialTest PasspointConfigurationTest
Change-Id: Ie99fe0430aa31ee7d461150eca5c9ce718f75aaf
2020-03-13 18:18:43 -07:00
Nate Jiang
110bc2ea99 Remove untrusted network flag from suggestion
Bug: 151150610
Test: atest android.net.wifi
Change-Id: Ieab8f45f2b75208e4d9bf9a8eb73a0fa71922589
2020-03-13 17:08:51 -07:00
Roshan Pius
4d4e926a74 Merge changes from topic "services.net-wifi" into rvc-dev
* changes:
  services.net: Add a static library needed by wifi module
  services.net: Use the new ModuleNetworkStackClient
2020-03-13 22:39:09 +00:00
Nate Jiang
b27625fbbc Set untrusted bit when create WIfiConfig
Bug: 151150610
Test: atest android.net.wifi
Change-Id: I24a9ff42913406a03f8978138a19047da2359a66
2020-03-13 14:57:16 -07:00
Roshan Pius
b6361f9490 services.net: Add a static library needed by wifi module
Add a new static library that compiles against system_current which
includes all the parts needed by the wifi mainline module.

Also,
a) Refactored TcpKeepalivePacketData to use public APIs. The parcel
read/write methods in the base class are @hide and they're not used by
the other child class (NatKeepalivePacketData). So, remove the @hide
method from base class and use it direcly in the child class.
b) Add jar-jar rules for all the statically linked dependencies in wifi
service jar rules.

Exempt-From-Owner-Approval: Minor change on top of owner's approval.
Bug: 145825329
Test: Device boots up & connects to wifi networks.
Change-Id: Ifde69b579cfe5b813766f676acb10e436e64a44c
2020-03-13 14:42:09 +00:00
Philip P. Moltmann
12ac3f406f Rename featureId -> attributionTag
In the core functionality this changes everything including aidl's and
field names:
- Context
- ContentProvider
- AppOps*
- Package parsing

For the rest, this is a shallow change to only change to the changed
APIs. This keeps the change small-ish

Exempt-From-Owner-Approval: Rename
Fixes: 148792795
Test: TH
Change-Id: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
Merged-In: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
2020-03-12 19:26:10 +00:00
Les Lee
84b4877d85 Merge "wifi: API Review: API changes to SoftApConfiguration.Builder" into rvc-dev 2020-03-12 03:49:32 +00:00
Hai Shalom
43cae91e96 Merge "[SAE] Remove support for SAE Password identifier from API surface" into rvc-dev 2020-03-11 18:25:44 +00:00
David Su
3320dd6186 Merge "MTS: only run FrameworksWifiApiTest if Wifi module is installed" into rvc-dev 2020-03-11 17:58:44 +00:00
Steven Liu
929401b590 Merge "update the document of API - WifiManager#getMatchingScanResults" into rvc-dev 2020-03-11 14:36:02 +00:00