From 7f94b17280db31a652cece7f75c8884d11dd18eb Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Tue, 18 Dec 2018 16:56:05 -0800 Subject: [PATCH 1/2] Added support for OSU Provider provisioning action on click Added a call to AccessPoint.startOsuProvisioning() to onPreferenceTreeClick to open up an OSU provider flow when the user clicks on an AccessPointPreference pertaining to an OSU provider AccessPoint. Bug: 118705403 Test: manual, build and tap on the OSU provider AP. Change-Id: I3c321c2a6d2336a0cc92a30ae051146d2fc05fb7 --- src/com/android/settings/wifi/WifiSettings.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index eddae067597..ca539146e9b 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -563,7 +563,9 @@ public class WifiSettings extends RestrictedSettingsFragment * networks, or Passpoint provided networks. */ WifiConfiguration config = mSelectedAccessPoint.getConfig(); - if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) || + if (mSelectedAccessPoint.isOsuProvider()) { + mSelectedAccessPoint.startOsuProvisioning(); + } else if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) || (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) { mSelectedAccessPoint.generateOpenNetworkConfig(); connect(mSelectedAccessPoint.getConfig(), mSelectedAccessPoint.isSaved()); From d3ba94b3325f21ced1fda3b4f75bbdc0d7e508bd Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Thu, 3 Jan 2019 15:54:54 -0800 Subject: [PATCH 2/2] Added autoscroll to top when clicking on OSU entry Bug: 118705403 Test: manual, build and click on OSU entry Change-Id: I78c69e49afc577140b819f2a4e949440a81d63c6 --- src/com/android/settings/wifi/WifiSettings.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index ca539146e9b..973697fecdb 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -565,6 +565,7 @@ public class WifiSettings extends RestrictedSettingsFragment WifiConfiguration config = mSelectedAccessPoint.getConfig(); if (mSelectedAccessPoint.isOsuProvider()) { mSelectedAccessPoint.startOsuProvisioning(); + mClickedConnect = true; } else if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) || (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) { mSelectedAccessPoint.generateOpenNetworkConfig();