commit 3eac2faa9c07f1e0224d63c6a587e7d89a6d1c9a
author Quang Luong <qal@google.com> Wed Jan 16 19:10:14 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 16 19:10:14 2019 +0000
tree 2b4cb1fbc98c32e86de21cf91192ece2cfa2afeb
parent 2a38d79137b9ede9634c2daeca13537dacf87d18
parent d3ba94b3325f21ced1fda3b4f75bbdc0d7e508bd

Merge changes from topics "osu-at-the-top", "osu-provisioning-support"

* changes:
  Added autoscroll to top when clicking on OSU entry
  Added support for OSU Provider provisioning action on click

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index eddae06..973697f 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -563,7 +563,10 @@
              * networks, or Passpoint provided networks.
              */
             WifiConfiguration config = mSelectedAccessPoint.getConfig();
-            if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
+            if (mSelectedAccessPoint.isOsuProvider()) {
+                mSelectedAccessPoint.startOsuProvisioning();
+                mClickedConnect = true;
+            } else if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
                     (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) {
                 mSelectedAccessPoint.generateOpenNetworkConfig();
                 connect(mSelectedAccessPoint.getConfig(), mSelectedAccessPoint.isSaved());