Commit Graph

3178 Commits

Author SHA1 Message Date
TreeHugger Robot
ca51ab418f Merge "[Passpoint] Allow profile installations with no Root CA certificate" into rvc-dev 2020-02-28 04:54:59 +00:00
Hai Shalom
ef8cfa2a46 [Passpoint] Allow profile installations with no Root CA certificate
Allow Passpoint R1 profile installations with no Root CA certificate.
The system will use the default trust root in such case.

Bug: 150410562
Test: atest CredentialTest
Change-Id: I2f11ba7330aae8a8c9e0b8922bcf320eb95c5e0e
2020-02-27 15:53:30 -08:00
Nate Jiang
a99073b296 Merge "Add Doc about app disable or netowrk reset will remove suggeestion" into rvc-dev 2020-02-27 18:33:27 +00:00
David Su
f16dce6f20 Merge changes from topic "api-review-getNetworkDisableReasonString" into rvc-dev
* changes:
  Settings: Rename NetworkSelectionStatus#getNetworkDisableReasonString
  Rename NetworkSelectionStatus#getNetworkDisableReasonString
2020-02-26 23:42:53 +00:00
David Su
c4b4ccf575 Merge "Wifi: Clean up APIs" into rvc-dev 2020-02-26 23:42:35 +00:00
Mingguang Xu
3b117214d5 Merge "Extension API: Replace NetworkScore object with integer in API surface" into rvc-dev 2020-02-26 21:41:03 +00:00
Roshan Pius
256b44d61d Merge changes from topics "remove_oem_configstore", "rename_oem_migration" into rvc-dev
* changes:
  WifiMigration: Add a method for removing config store
  WifiOemMigrationHook: Rename class to address API council feedback
2020-02-26 20:55:40 +00:00
Nate(Qiang) Jiang
4146fb0bcf Add Doc about app disable or netowrk reset will remove suggeestion
Bug: 150247605
Test: build
Change-Id: Iaeec1404311bb3eea1d0be83d20a4bf0c8962d61
2020-02-26 10:28:43 -08:00
David Su
e4956075da Rename NetworkSelectionStatus#getNetworkDisableReasonString
Renamed to getNetworkSelectionDisableReasonString
to be more descriptive.

Bug: 146046526
Test: compiles
Change-Id: I8d67906e31e66f4cf839be1637ecb6a58edbbc52
2020-02-25 15:32:43 -08:00
Roshan Pius
4c7baf7ba2 WifiMigration: Add a method for removing config store
Adding a new method to trigger OEM config store removal after migration
is complete.

Bug: 149418926
Test: Compiles
Change-Id: Ie22ff99931cc5f2ccbc47a55a2ac6e3b2baa41d7
2020-02-25 10:18:52 -08:00
TreeHugger Robot
426b08e2f4 Merge "wifi: Revise java doc to add more explanation" into rvc-dev 2020-02-25 03:48:14 +00:00
Nate Jiang
bd463a2b2d Merge "Override hashcode, equals function for PnoNetwork" into rvc-dev 2020-02-25 00:22:59 +00:00
Roshan Pius
807b34a2c6 WifiOemMigrationHook: Rename class to address API council feedback
Bug: 149418926
Test: Compiles
Change-Id: I59a6e893599b1ccaec51a39c9594f157622668a0
2020-02-24 11:49:02 -08:00
Mingguang Xu
dea9593d23 Extension API: Replace NetworkScore object with integer in API surface
NetworkScore object is removed as part of punting the network selection refoundation feature out of Android 11.

Test: atest android.net.wifi
Bug: 135573686, 122133502, 136312816, 135572156

Change-Id: Ib4226a4d66ab29fc4b31226d5ece8ad14a14d1e1
Signed-off-by: Mingguang Xu <mingguangxu@google.com>
(cherry picked from commit 705d110d85)
2020-02-24 19:05:32 +00:00
lesl
7a0c18c884 wifi: correct API name
The API:isFeatureSupported accept one or combination
of required features, update the jave doc & rename to areFeaturesSupporte

Bug: 149871866
Test: make docs frameworks/base/wifi/
Test: atest frameworks/base/wifi/tests/
Merged-In: I3bcbcfd04dced36b63436b5a96835fb0d8f35f3b
Change-Id: I3bcbcfd04dced36b63436b5a96835fb0d8f35f3b
(cherry picked from commit dd8f942e81)
2020-02-24 06:28:58 +00:00
lesl
b17fc5d2e5 wifi: Revise java doc to add more explanation
1. restoreSoftApBackupData - document return value
and behavior if input is invalid
2. onCapabilityChanged - document behavior on register

Bug: 149871866
Test: make docs frameworks/base/wifi/
Mergrd-In: I02085e614a35b0bf07dbc47cffe7255555a0deb8
Change-Id: I02085e614a35b0bf07dbc47cffe7255555a0deb8
(cherry picked from commit dba305d37d)
2020-02-24 06:24:36 +00:00
David Su
692a70d570 Wifi: Clean up APIs
- Made WifiInfo.Builder public
- Made ScanResult::new public
- Added public getters for WifiNetworkSuggestion

Bug: 149912516
Test: compiles
Test: Will add CTS for new WifiNetworkSuggestion APIs
Change-Id: I868477f0d149cb4e96f9313dbaa1ef66d4723309
2020-02-23 19:12:11 +00:00
Nate(Qiang) Jiang
8429500539 Override hashcode, equals function for PnoNetwork
Bug: 148535554
Test: atest android.net.wifi
Change-Id: I9f6ea75966b97ac67234b73a8198492a8edfacb2
2020-02-22 15:55:54 +00:00
Colin Cross
9a9e9a59a5 Merge "Revert "Exempt-From-Owner-Approval: Workaround for build break on WifiNl80211Manager"" 2020-02-21 22:27:01 +00:00
Sunil Ravi
7d2958513d Merge "Wifi: Add support for connecting to FILS APs" 2020-02-21 19:00:28 +00:00
Colin Cross
1adb838636 Revert "Exempt-From-Owner-Approval: Workaround for build break on WifiNl80211Manager"
This reverts commit d90bc26a07.

Sharding jarjar'd classes is fixed.

Bug: 149969343
Test: m framework-minus-apex
Change-Id: I12ae9d4870a3fad5c61c143368e0ef9025202ccd
2020-02-21 08:19:33 -08:00
Charles Chen
d90bc26a07 Exempt-From-Owner-Approval: Workaround for build break on WifiNl80211Manager
Test: build pass
Bug: 149969343
Change-Id: I11c981a6e743f1f3b1f5c7581fdc851d81904322
2020-02-21 09:23:21 +00:00
Les Lee
427a30c8f7 Merge "wifi: Use long to replace int for softap feature set" 2020-02-21 06:07:13 +00:00
TreeHugger Robot
5dc2fab572 Merge "[Passpoint] Print home or roaming in WifiConfiguration" 2020-02-20 18:36:56 +00:00
Hai Shalom
ded2212304 [Passpoint] Print home or roaming in WifiConfiguration
Print provider network home or roaming in the toString()
method of WifiConfiguration.

Bug: 149881869
Test: Verify new field is printed
Change-Id: Iddcd03435eb416bd6dc73bd0e7e32f180e0265d6
2020-02-20 08:34:46 -08:00
lesl
d41a299561 wifi: Use long to replace int for softap feature set
Bug: 149871866
Test: atest frameworks/base/wifi/tests/
Change-Id: I58a408150325054af809bdb18c77748ead3a0b17
2020-02-20 17:41:40 +08:00
Roshan Pius
39c63e339f Merge "WifiOemMigrationHook: Default to false for verbose logging flag" 2020-02-20 04:31:36 +00:00
Roshan Pius
fc4ff5dc46 WifiOemMigrationHook: Default to false for verbose logging flag
Bug: 149879075
Test: Compiles
Change-Id: Ib7154a6e5fe3b74c4df3b326c82de6304f779d34
2020-02-19 20:02:23 -08:00
TreeHugger Robot
3237779fac Merge "Verbose Logging: Add maxTargetSdk" 2020-02-19 23:44:22 +00:00
David Su
740e68c2ae Verbose Logging: Add maxTargetSdk
Add maxTargetSdk = Q for @UnsupportedAppUsage
Wifi Verbose Logging APIs. Callers on Android R+
should use formal @SystemApi's.

Bug: 148967842
Test: compiles
Change-Id: I27798f2ae97f07c3452e13ff8f82fdc90b36298d
2020-02-19 13:37:39 -08:00
Hai Shalom
da4585593f Merge "[Passpoint] Remove throws IllegalStateException form getUniqueId API" 2020-02-19 20:17:42 +00:00
Roshan Pius
bd8dd47fde Merge changes from topics "ap_shutdown_timeout_flag", "scan_always_available_API"
* changes:
  WifiOemMigrationHook: Migrate Settings global values
  WifiManager: Add API for scan always available toggle
  SoftApConfiguration: Add shutdown enabled method
2020-02-19 16:28:43 +00:00
Hai Shalom
efc940ff3f [Passpoint] Remove throws IllegalStateException form getUniqueId API
Following up on feedback from API council:
Remove throws IllegalStateException form PasspointConfiguration#getUniqueId
API. No need to explicitly declare runtime exceptions.

Bug: 149758065
Test: PasspointConfigurationTest
Change-Id: I9022a7c87ef9839c6b60fdfd8394915779fa708b
2020-02-18 16:24:49 -08:00
Etan Cohen
251c21df37 Merge "[WifiNl80211] Rename WifiNl80211Manager namespace" 2020-02-18 16:50:12 +00:00
Roshan Pius
6d4cb9cdc7 WifiOemMigrationHook: Migrate Settings global values
Changes:
a) Add a method to migrate Settings values from platform.
b) Marked all of those settings back to @hide.
c) Also, deprecated couple of public Settings keys which are no longer
used in the wifi stack.

Bug: 148514485
Test: Compiles
Test: TBD: Add unit tests for this class.
Change-Id: I3566cdb53fc997fbb2cc5bceadd865ff8b01539b
2020-02-18 07:27:28 -08:00
Roshan Pius
6398957728 WifiManager: Add API for scan always available toggle
Needed for moving away from using Settings.Global values as pseudo APIs.

Bug: 148514485
Test: atest android.net.wifi
Test: Verified wifi wifi scan toggle in location settings.
Change-Id: Iec75d331c7866180a55a327813466323c565319a
2020-02-18 07:27:28 -08:00
Roshan Pius
1861fa18be SoftApConfiguration: Add shutdown enabled method
This allows us to stop relying on the @hide Settings.Global value.

Bug: 147779354
Bug: 148514485
Test: atest android.net.wifi
Change-Id: Iacd5553f971cf5bfe1e794b01179e29cb65a1925
2020-02-18 07:27:27 -08:00
TreeHugger Robot
309dca6ae2 Merge "Rename PasspointConfiguration#getSubscriptionExpirationTimeInMillis" 2020-02-17 16:23:47 +00:00
Arc Wang
1caf57d5ca Rename PasspointConfiguration#getSubscriptionExpirationTimeInMillis
Rename to getSubscriptionExpirationTimeMillis.

Bug: 149434940
Test: compiles
Change-Id: I34f395d14bc03432170ecf2d331cf1bf5088ae68
2020-02-17 10:15:32 +08:00
Etan Cohen
804d94a100 [WifiNl80211] Rename WifiNl80211Manager namespace
Finish the renaming process from wificond -> nl80211.

Bug: 149105833
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: Icf94799b560da66a5366743fd2a33b0f152da335
2020-02-15 17:33:27 -08:00
David Su
60892133a4 Merge changes from topic "api-review-requirepmf"
* changes:
  SettingsLib: Rename requirePMF to requirePmf
  Wifi: Rename requirePMF to requirePmf
2020-02-14 18:27:15 +00:00
Etan Cohen
ee9f12795b Merge "[WIFICOND] Rename to nl80211" 2020-02-13 22:34:09 +00:00
TreeHugger Robot
7900e4d73e Merge "[Passpoint] Truncate IMSI from the SimCredential toString method" 2020-02-13 20:18:41 +00:00
Adrian Roos
fc2f5882c9 Merge "API Lint: Ignore existing CallbackMethodName violations" 2020-02-13 17:33:18 +00:00
Adrian Roos
bdb30cb6bb API Lint: Ignore existing CallbackMethodName violations
Bug: 149430296
Test: make checkapi
Change-Id: Ic6f634355c77f4236083065f7ca933fbee5534a6
Exempt-From-Owner-Approval: API Lint suppresion
2020-02-13 00:59:51 +00:00
Hai Shalom
91c3b5af51 [Passpoint] Truncate IMSI from the SimCredential toString method
Truncate IMSI from the SimCredential toString method, avoid displaying
confidential IMSI information.

Bug: 149422812
Test: dumpsys wifi - confirm result
Change-Id: I9d542bc6ff60de1a78076abe1010c0c03a5f444b
2020-02-12 15:19:23 -08:00
David Su
381ba3e270 Wifi: Rename requirePMF to requirePmf
Rename to conform to API guidelines.

Bug: 146046526
Test: compiles
Change-Id: If8089bcbf9e18d4fadfe8abe7fdab418f8c1bbca
2020-02-12 13:56:49 -08:00
Hai Shalom
5dd61a39c5 Merge "[Passpoint] Fix connected network not showing in Wi-Fi picker" 2020-02-12 21:18:36 +00:00
TreeHugger Robot
644610cd07 Merge "wifi: add WAPI-CERT case for enterprise netowrk" 2020-02-12 01:53:41 +00:00
Hai Shalom
697e02a3b8 [Passpoint] Fix connected network not showing in Wi-Fi picker
Newly added network by OSU does not appear in Wi-Fi picker even
when connected.
Root cause: newly added unique identifier included the certs and
key material in the hash, but after the profile is installed,
the certs and keys are moved to keystore and removed from the
configuration, hence the change in hash.

Bug: 149322822
Test: Manual OSU connection and provisioning successfully,
verifying connected network appears in Wi-Fi picker
Test: atest PasspointConfigurationTest

Change-Id: Idec09bc77cb3562bb6bfe9e586a3aa7b2dce85bd
2020-02-11 16:22:27 -08:00