Commit Graph

3482 Commits

Author SHA1 Message Date
Roshan Pius
9f183e0108 WifiManager: Add @hide constant for sap
Reason code used to send out a disconnect when SAP is being shutdown.

Bug: 154286607
Test: Compiles
Change-Id: I3cb9b97960c1c9002435f23ba72ed14005a2d814
2020-04-20 10:11:01 -07:00
Roshan Pius
945a3757d2 wifi: jarjar network stack AIDL interfaces
This was the last set of wifi dependencies that were
not jarjar'ed.

Bug: 153596226
Test: Device boots up and connects to wifi networks
Test: Both the commands below return empty list:
a) dexdump service-wifi.jar | grep 'Class descriptor' |
grep -v -e "com/android/server/wifi" -e "com/android/wifi/x/"
b) dexdump framework-wifi.jar | grep 'Class descriptor' |
grep -v -e "android/net/wifi" -e "com/android/wifi/x/"

Change-Id: Ib214b130a740c1840890d5183ab8be594d3af7c8
2020-04-16 06:37:36 -07:00
TreeHugger Robot
65a3920a07 Merge "wifi: Jar jar all external dependencies to a singe namespace" into rvc-dev 2020-04-13 18:18:34 +00:00
Roshan Pius
71709e04c9 WifiConfiguration: Add a method to check if keymgmt needs preShareKey
Bug: 153435438
Test: atest android.net.wifi
Change-Id: If67d853000d99f32204bf0b8b95465909e8740e2
2020-04-11 04:38:59 +00:00
Roshan Pius
5e85ab2683 wifi: Jar jar all external dependencies to a singe namespace
Differentiation between framework-wifi & service-wifi included static
dependencies were getting a little hard to manage. Also, use
com.androd.wifi.x@0 to preserve the original package name.

Bug: 153697614
Test: Device boots up and connects to wifi networks
Test: Manual inspection using dexdump on both framework-wifi.jar & service-wifi.jar
Change-Id: Ifa1efaa772a708c0d40d2d9be415d0c42b71b332
2020-04-10 14:41:01 -07:00
Roshan Pius
cfc6db259d wifi: Add subfilters for android.hardware.wifi
Renaming android.hardware.wifi package also renames the various wifi
PackageManager feature flags. So, refine it to only match the HIDL
stubs.

Bug: 153697614
Test: Manual
a) Added a log to check for rtt, p2p, aware feature flags in Wifiservice
b) Returns false before the change.
c) Returns true with the change.
Test: Manual
dexdump and ensured that all the HIDL stubs are renamed.
Test: Device boots up and connects to wifi networks.
Test: Cts-Verifier aware RTT test does not fail immediately.
Wi-Fi Aware test --> Discovery with ranging --> Publish.
Change-Id: I43ac3195304a4bd2d8e725a4302eb4239290396f
2020-04-10 18:37:01 +00:00
Roshan Pius
0cadd8c7c4 Merge "wifi(jar-jar): Jar-jar all static dependencies" into rvc-dev 2020-04-10 05:30:50 +00:00
Roshan Pius
5a283f2d9d wifi(jar-jar): Jar-jar all static dependencies
Bug: 153596226
Test: Device boots up and connects to wifi networks.
Test: Manual inspection of classes included in framework-wifi &
service-wifi using dexdump

Change-Id: Ic31cdae62761110eeb4834a588b36328de19adb8
2020-04-10 05:14:03 +00:00
Nate Jiang
69e1136884 Change doc for suggestion API
Add more explanation in doc, when app receive error code calling
suggestion API.

Bug: 150215899
Test: atest android.net.wifi

Change-Id: I8055546be8f12f807c35b9f50b239940a671482e
2020-04-09 18:18:01 -07:00
Roshan Pius
21eb629baa wifi(jar-jar): Jar-jar HIDL stubs to a separate namespace
This is statically linked by the wifi service, so should be jar-jar'ed
out to a separate namespace to avoid other components in system_server
calling our copy of the stubs.

Bug: 151475926
Test: Device boots up and connects to wifi networks.
Change-Id: I79247b72a3b5f6dabf38c3cb9705fb5ca0aa729f
2020-04-08 16:02:14 -07:00
TreeHugger Robot
c524ad59f3 Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev 2020-04-07 13:38:37 +00:00
Roshan Pius
573e3fe6be WifiNetworkSpecifier: Ensure we don't match a regular wifi network
In Android 10, ClientModeImpl would always attach a
WifiNetworkAgentSpecifier for all wifi network agents created
(regardless of whether it was created in response to a specific request
or not). In Android 11, we changed that behavior to ensure that we
attach the WifiNetworkAgentSpecifier only for agents created in response
to a specific request. However, that is exposing a bug in
WifiNetworkSpecifier matching. WifiNetworkSpecifier attached requests
should not satisfy a generic wifi network agent. Fix the
canSatisfiedBy() matching to ensure that it only matches
WifiNetworkAgentSpecifier (or itself which cannot happen during network
matching)

Bug: 149500993
Test: Add a saved network manually while running the failing ACTS test:
act.py -c wifi_manager_cross.config -tb dut-name -tc WifiNetworkRequestTest:
test_match_failure_with_invalid_ssid_pattern
Test: atest android.net.wifi

Change-Id: I38d154bd0a5685fcc38de891256a8e1d4b8cfbb5
2020-04-07 06:45:46 +00:00
David Su
7309ac6092 Merge "framework-wifi: Remove dependency on framework-telephony-stubs" into rvc-dev 2020-04-06 19:01:46 +00:00
David Su
34fc65accf framework-wifi: Remove dependency on framework-telephony-stubs
Since Telephony is no longer a module, `framework-telephony-stubs`
is already part of `module_current`. Only stubs from other modules
need to be explicitly included.

Bug: 151092414
Test: compiles
Change-Id: Iedf05a82dea9e6831b6253dfcb213162d2b9e127
2020-04-04 01:37:28 -07:00
Roshan Pius
8a31e59ece Merge "WifiManager: Update doc for new metered change behavior" into rvc-dev 2020-04-04 00:31:04 +00:00
Roshan Pius
12e167b30e WifiManager: Update doc for new metered change behavior
Also, explictitly mark OVERRIDE_NOT_METERED in WifiConfiguration
when suggestion is not metered.

Bug: 153127005
Test: Compiles
Change-Id: I917de747406167fc38faa05e15d98a9b867a6ce8
2020-04-03 13:27:50 -07:00
Hai Shalom
faac9ca5a9 Merge "[DPP] Fix typo in javadoc for SUCCESS_CONFIGURATION_APPLIED" into rvc-dev 2020-04-03 20:21:34 +00:00
Hai Shalom
c5962ff651 [DPP] Fix typo in javadoc for SUCCESS_CONFIGURATION_APPLIED
Bug: 153015500
Test: No code changes
Change-Id: I3275680ccd6161b703ad60dbe82e558fc17e37e5
2020-04-01 15:55:20 -07:00
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