Commit Graph

240 Commits

Author SHA1 Message Date
govenliu
41cdecca3d [Wi-Fi] EAP method AKA' did not pronounced as AKA prime.
Spinner did not use ttsspan to store the display string so AKA' just
pronounced as AKA.

To fix it, use charsequence array, which each specific array item have
the ttsSpan to store the string for TTS engine.

Bug: 119929832
Test: Set a 3-texts array and check if the specific array item
replacement mechanism work correctly or not.

Change-Id: I8e7d10da99a3f3503e1019687c45cf40070d0045
2019-07-11 09:31:15 +08:00
Arc Wang
838cbbf539 [Wi-Fi DPP] Remove scanner button of unsaved WiFi network dialogs
Romove it because we may not ensure the network of a QR code is
matching the selected one.

Bug: 134701332
Test: manual visual
Change-Id: I264e921c806f2b335d158fc4cffc48acf69f5c19
2019-06-13 16:17:03 +08:00
Hai Shalom
98aa52dbec [OWE] Support OWE in transition mode
Support OWE in transition mode for devices with OWE support
and devices without OWE support. Scan results will return a
new type of network for OWE in transition networks on devices
that support OWE, and Open for devices that don't support OWE.
Handle the case where Open network is manually added to a device
that supports OWE.

Bug: 132139642
Test: Device with OWE: Connect to Open, OWE-Transition, OWE networks
Test: Device without OWE: Connect to Open, OWE-Transition
Test: Manually create Open network, connect to OWE-Transition
Change-Id: I1a584ccbfec8507803c527ea13933cff6f699ccb
2019-05-13 15:37:44 -07:00
Hai Shalom
3fc9dc3ada [WPA3] Fix connectivity issues with PSK-SAE Transtion mode
Fix two reported issues regarding PSK-SAE transition mode:
1. When phone supports SAE, creating a manual saved network with PSK
and manually connecting would cause the phone to connect but Settings
does not display any connected AP. Phone would not autoconnect.
2. When phone doesn't support SAE, phone cannot connect to an AP in
PSK-SAE Transition mode because the framework always targets the highest
security.

Bug: 132278271
Test: Connect to WPA2 network
Test: Connect to WPA3 network (w/capable phone)
Test: Connect to WPA2/3 Transition w/SAE capable phone
Test: Connect to WPA2/3 Transition w/SAE not-capable phone
Change-Id: I371bcb4b2cccfc8684ecb5db3a768524f7354598
2019-05-10 12:59:23 -07:00
Arc Wang
dae6c695ca Hide Wi-Fi QR code scan button for unsupported Wi-Fi networks
Wi-Fi QR code scan button only shows for the Wi-Fi network which
supports Wi-Fi Easy Connect or ZXing Wi-Fi config format.

Bug: 128847959
Test: manual
Change-Id: If6460ce88748e7b06893bf62060418a8727d3134
2019-03-29 10:17:44 +08:00
Hai Shalom
566101d166 [WPA3] Initialize Suite-B ciphers correctly based on the CA cert type
Initialize Suite-B ciphers correctly based on the CA cert type. Read the
cert type from key store, parse it and get the signature algorithm.
Enforce SHA384, and initialize AllowedSuiteBCiphers based on the
certificate type: RSA or ECSDA.
Wi-Fi alliance requires the use of both ECDSA secp384r1 and RSA 3072
certificates in WPA3-Enterprise 192-bit security networks, which are
also known as Suite-B-192 netowkrs, even though NSA Suite-B-192 mandates
ECDSA only. The use of the term Suite-B was already coined in the
IEEE 802.11-2016 specification for AKM 00-0F-AC but the test plan for
WPA3-Enterprise 192-bit for APs mandates support for both RSA and ECDSA,
and for STAs it mandates ECDSA and optionally RSA. In order to be
compatible with all WPA3-Enterprise 192-bit deployments,

Bug: 128861164
Test: Verify Suite-B initialized correctly with RSA and ECDSA certs.
Test: Associate to SUITE_B_192 AP with RSA certificate
Test: Associate to SUITE_B_192 AP with ECDSA certificate
Change-Id: I5e8b6794e68ed3af5f8c8beac622fff8076a46a1
2019-03-25 14:40:59 -07:00
xshu
900465fde7 Change feature flag to correct flag
Sorry, I provided the wrong flag that was supposed to be fore p2p MAC
randomization. Changing to the correct flag now.

Bug: 127817791
Test: compile
Change-Id: I46828e17411372c5e347b4fd17d853fe95f024a4
2019-03-13 16:37:25 -07:00
Quang Luong
252ae8bed0 Merge "Use getTitle() for AccessPoint display name" 2019-03-11 19:46:03 +00:00
Quang Luong
0df143834a Use getTitle() for AccessPoint display name
Instead of getSsidStr(), AccessPoint display names should use
getTitle() to accomodate Passpoint networks which use a provider
name instead of a single ssid. This change allows the provider
name to be displayed in the network details page, the long
press wifi dialog, and the config editing dialog.

Bug: 118705403
Test: atest WifiSettingsTest
Change-Id: I930d6218c7e464ad20c0c61130e0cb9ce315d9a2
2019-03-08 14:42:29 -08:00
cosmohsieh
fb6b71e2d3 [MAC Randomization] Align feature flag to global flag as framework
Removed feature flag and change to check global flag as framework MAC
randomization api does.

Bug: 127817791
Test: atest WifiPrivacyPreferenceControllerTest
Change-Id: I6d5f67d45c9bdbfb47cddfc402d13627dc5a8a6e
2019-03-08 13:38:27 +08:00
Hai Shalom
9d8d090c08 [OWE] Rename isOweSupported to isEnhancedOpenSupported
Stick to the official WFA marketing name in this public API.

Bug: 125850601
Test: atest com.android.server.wifi
Test: Use Settings to scan and connect to OWE network
Test: atest WifiConfigControllerTest
Change-Id: I1360658e805b10db65f66f1194e342b063b741a4
2019-02-28 19:27:35 -08:00
Sunil Ravi
7d0d684339 WiFi: Replace -1 with LINK_SPEED_UNKNOWN constant
Defined constant LINK_SPEED_UNKNOWN = -1 in WiFiInfo for unknown link
speeds. So replacing -1 with this new macro.

Bug: 124302657
Test: Connect STA to AP and verify the link speeds in network details.
Change-Id: Ie21069984adb02420ca55b08a8cb161aaad2b7b3
2019-02-26 13:32:40 -08:00
Quang Luong
cb0b08aac2 Updated arguments for AccessPoint.getSummary calls
Changed the arguments for getSummary to reflect the changes in
settingslib

Bug: 118705403
Test: none
Change-Id: I2bd02e608a900865ff90dd78463a164fca39c905
2019-01-31 13:03:08 -08:00
Roshan Pius
04dd29fc38 Merge "AccessPoint: App attribution for suggestion/specifier" 2019-01-30 03:03:20 +00:00
cosmohsieh
b521bd6225 [Mac Randomization] Change order of Privacy setting in "Add network"
page

For better UX, making the default option 'Use randomized MAC (default)' as the
first option item in "add network" page.

Bug: 123160090
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ifdba5a323df21c8d3442f394acdebd1c3f259c69
2019-01-25 12:05:18 +08:00
Roshan Pius
896cfd538c AccessPoint: App attribution for suggestion/specifier
Bug: 115504887
Bug: 113878056
Test: atest AccessPointTest WifiTrackerTest
Test: Manual UI verification
Change-Id: I104fb6f428e66ab15ab1e0d0358da39652c28115
2019-01-24 08:09:44 -08:00
cosmohsieh
82588849ac [Mac Randomization] Fix perference changing not work and wrong default
value

1. Mac randomization setting would not effect, until reconnecting the network.
Disconnect it and WiFi will soonly connect back.
2. Mac randomization setting of adding network page is default to
"device MAC", correcting to "Randomization"

Bug: 123123123
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I91f8670ddf81aea89354c4cc9c9a7901b8f3409c
2019-01-16 19:45:32 +00:00
Sunil Ravi
00020f6605 Merge "WiFi: Add Tx and rx link speed in network details" 2019-01-15 18:43:58 +00:00
Sunil Ravi
39d372e676 WiFi: Add Tx and rx link speed in network details
current "link speed" in UI is renamed to "Transmit link speed".
Also Added Receive link speed in network details.

Bug: 120497598
Test: Connected to AP and verified the Rx link speed in Network details.

Change-Id: I01cf7362a27ad78ddfaef68efae4d07cbd14fc55
2019-01-14 16:31:01 -08:00
Hai Shalom
b5c286a4a4 [WPA3] Rename allowedGroupMgmtCiphers to allowedGroupManagementCiphers
Following API Council review:
Rename allowedGroupMgmtCiphers to allowedGroupManagementCiphers in all instances
in order to be consistend with existing members.

Bug: 122616519
Test: atest com.android.server.wifi
Change-Id: I42496a0c9fa1034beffd9b05eeafd2f0a75eb1a8
2019-01-10 12:42:46 -08:00
cosmohsieh
18e3692ea3 Remove bug id for WiFi MAC randomization since feature is ready.
Bug: 117957974
Test: RunSettingsRoboTests
Change-Id: I36955d302d9c365e7985a53c6a2a89026f6ebb34
2018-12-12 02:16:47 +00:00
Hai Shalom
1638168336 [WPA3] Filter unsupported networks from Add network spinner
Filter unsupported networks from Add network spinner. Removed entries
from wifi_dialog.xml, adding them dynamically based on device
capabilities. Adding position-to-security table, that decouples spinner
positions from security values.

Bug: 112195778
Test: atest WifiConfigControllerTest + device functional test
Change-Id: I6a814c4d69fbd8d8076db5dbaa5da807b4da4c32
2018-11-21 18:58:38 -08:00
Hai Shalom
f2f00313bb packages/apps/Settings: Add logic and strings to support WPA3 and OWE
Add and update Wi-Fi security strings, and add logic to enable WPA3
and OWE. Modified WPA2-PSK to WPA2-Personal, and added WPA3-Personal,
Enhanced Open and WPA3-Enterprise.

Bug: 112195778
Test: Basic functional tests
Change-Id: Ia97761a7f0a9e2fee768dfaf3578a2f1090d29c6
2018-11-05 16:40:07 -08:00
Johnson Lu
e936774fa3 Adjust Wifi Privacy preference.
Show Wifi MAC Randomization preference in both "Add network" and "Join
Network" flows.

Bug: 1227787
Test: RunSettingsRoboTests
Change-Id: Iff422eb870e661ceda5ae04f55de802a91f08aeb
2018-10-22 16:49:18 +08:00
jackqdyulei
e95f07dff6 Still check the visibility of view
Since EAP has many sub type, which controls differnet view. We still need to check the
visibility to determine which type it is.

Bug: 116767176
Test: RunSettingsRoboTests
Change-Id: Iee04a50140ae1afacdf77eedf7743a465bae1f58
2018-09-27 16:37:48 -07:00
jackqdyulei
0c6f8065c2 Fix bug in Add network fragment
After we switch secutiry from EAP to WPA, add button will become
disabled forever. Main reason is that we use view visibility to decide
which security type it is. In this case target view is visible while its
parent view is gone. So even though UI shows correctly however we still
think it is in EAP mode.

This CL check the mAccessPointSecurity directly instead of depending on
fragile view.

Fixes: 114689178
Test: RunSettingsRoboTests

Change-Id: I4284d25e6bf86ee7c5e7c0e17f0834c719d8d587
2018-09-14 11:10:31 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
Daichi Ueura
cbd04dcade Merge "Hide entire hidden field for non-hidden networks" into pi-dev am: 2c793dfeff
am: 1a2153e6ab

Change-Id: Id5dc0b1855520c9071ce3b8c2897f2b69d3b3791
2018-05-23 16:05:02 -07:00
Daichi Ueura
9555afb64e Hide entire hidden field for non-hidden networks
This CL hides not just hidden network spinner but entire
hidden field when a user is adding a network from scanned
network list.

Test: robotests
Bug: 80114851
Change-Id: I8b29fd764d62af1e46beaa7d26fae97848f4efe6
2018-05-23 09:18:07 -07:00
Salvador Martinez
7e4f8a28eb Merge "Hide hidden network spinner for non-hidden networks" into pi-dev am: cda8a44cee
am: f94119e739

Change-Id: If887d0c414649489d483bf523316d1f960798000
2018-05-09 16:56:30 -07:00
Salvador Martinez
d86cbe36b0 Hide hidden network spinner for non-hidden networks
We only want to show this when a user is manually adding a
network. This CL hides it when the user is adding a network
from the detected wifi list.

Test: robotests
Bug: 78436456
Change-Id: I81d738267d4cb21d6b7722ec619faaf8ef1fc965
2018-05-07 14:46:56 -07:00
Salvador Martinez
f0fce68a9b Merge "Disable hidden network spinner on existing networks" into pi-dev am: ac951a69aa
am: 062dbc2054

Change-Id: I29b27335730594d70805a14ac74d948d6dbef509
2018-04-23 15:11:47 -07:00
Salvador Martinez
35b76437e0 Disable hidden network spinner on existing networks
We only want this to be modifiable if you are adding a network
manually, so this CL disables it for existing networks. You
can still see what the spinner is set to though.

Test: robotests
Bug: 78436456
Change-Id: If660e432eca2dabf5bd16881368657ee89fe5a57
2018-04-23 10:50:22 -07:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
2018-04-20 12:52:29 -07:00
Salvador Martinez
8bc3fa0649 Update add network dialog to not make networks hidden by default
This CL updates the add network dialog to use the provided value
for the hidden state (from androids perspective) of the network. The
default selected value will always be not hidden and if the user
selects to mark it as hidden a warning will appear to inform the
user of the privacy implications.

Test: Robotests
Bug: 29003359
Change-Id: Ifd4511e4d0af6eb01f4e951c22a91fc560393e8d
2018-03-29 23:01:24 -07:00
Yuchen Chang
1bf069f839 Request focus in wifi screen in add network and secure wifi
Request focus from parent view in controller. Based on framework
patch, it can be placed in a parent and focus will go to whatever view
is the default focusable in that hierarchy.

Fixes: 68776177
Fixes: 72882629
Test: RunSettingsRobotests and Manual test
Change-Id: I3bcdc4ec814f68079a00e40435f46bdfa53f4425
2018-03-14 17:18:39 +08:00
Ecco Park
bffd531aa3 Fix the system crash issue when secondary user clicks any 802.1x AP on
Wifi Picker.

Catch the exception when keystore failed to list the certs

Bug: 73794111
Test: test it with clicking the Google-A on Wifi Picker.
Test: make ROBOTEST_FILTER="(WifiConfigControllerTest)"
RunSettingsRoboTests -j32
RunSettingsRoboTests: OK (12 tests)

Change-Id: I0db66730261c72ef35d1b299bacd2aed7710d247
2018-03-13 16:49:08 -07:00
Fan Zhang
119ea0f0d1 Merge "Wifi: Restore hidden flag for hidden networks on update network" am: 0138575b8d am: e1c58570d6
am: 935ce87d32

Change-Id: I4ad47e788c1ab591dc82a031ef22dadc65bf8582
2018-02-21 18:04:26 +00:00
Fan Zhang
935ce87d32 Merge "Wifi: Restore hidden flag for hidden networks on update network" am: 0138575b8d
am: e1c58570d6

Change-Id: Ice03d80eedf64fb08a12471b22bfdff53b4f934b
2018-02-21 17:55:50 +00:00
Anurag Das
f44da638bd Wifi: Restore hidden flag for hidden networks on update network
Currently when user modifies any of the network parameter for hidden
networks, hidden flag is not updated. As a result this network is no
longer part of hidden networks, we are unable to reconnect when user
triggers wifi off and on.

This commit sets the value of hiddenSSID flag of config at the Settings
side on network update.

Test: manual test with hidden access point
Bug: 73256783

Change-Id: Ic20f03345645d8bf3bc9c3ff44910dd3f2797fec
2018-02-20 06:56:09 +00:00
jackqdyulei
261c29c485 Add wifi metered controls in wifi settings.
1. Add it in wifi detail page
2. Add it in wifi dialog
2. Remove it in "Mobile network" page

Bug: 68030417
Test: RunSettingsRoboTests
Change-Id: I2e001c55f3c6c75a660e429732dfbece97b0ca9e
2018-01-09 12:44:51 -08:00
Ningyuan Wang
6c12f06bf8 Enforce null check for mAccessPoint
mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.

Bug: 68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest

Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
(cherry picked from commit 0117b995f4)
2017-11-08 18:24:48 +00:00
TreeHugger Robot
c90b0196eb Merge "Enforce null check for mAccessPoint" 2017-11-06 17:42:39 +00:00
Ningyuan Wang
0117b995f4 Enforce null check for mAccessPoint
mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.

Bug: 68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest

Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
2017-11-03 17:31:03 -07:00
Fan Zhang
a7f135596d Switch to use ThreadUtils.postOnMainThread
Change-Id: I344d25a1a667de9c0b23d6d528d905b4da3a4c40
Fixes: 63896139
Test: rerun tests
2017-10-31 13:27:41 -07:00
Tony Mantler
d9af0b839d Move SimStatus and ImeiInfo Pref Controllers to SettingsLib
Bug: 67410808
Test: RunSettingsRoboTests
Change-Id: Ib55d2365814b5882f7fcae6bb7f1b62cc3d6ad4e
2017-10-23 15:42:43 -07:00
Glen Kuhne
c98eee331a Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev am: 85f59ff42d
am: 91aeed6f55

Change-Id: I65d9d59816f9a1b248bfa9bcf7e801260f60bc01
2017-10-12 19:14:50 +00:00
Glen Kuhne
ddf705903e Allow 64 char HEX string PSKs in WifiSettingsUi
A check for valid PSKs in the settings UI didnt capture the 64 character
HEX string case. Added a check for it.

Test: tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java
Test: manual verification
Bug: 67492639
Change-Id: Ide738c4a67f23b613883b4a69f8264a0ffb8a0bc
2017-10-10 13:12:21 -07:00
Eric Schwarzenbach
5a7e46dd80 Add modify button to WifiNetworkDetailsFragment.
Adds pencil icon to Wifi Detail action bar to modify the network.
Modifies package/public visibility to allow the detail package to
use the WifiDialog. Listens for changes in WifiConfigurations to
propagate changes to the UI in WifiNetworkDetailsFragment.

Changes WifiNetworkDetail preference launch to conform to pattern
of other Settings apps. Removes unused WifiDetailActionBarObserver.

Bug: 36483704, 37082355
Test: make -j40 RunSettingsRoboTests
Change-Id: Ie9dc1892eaefdfad4a6bd7040bfc5dbf6236cfb4
2017-09-08 13:39:22 -07:00