commit 65977298297cf8bada6f409d15f64380c4668590
author Benjamin Franz <bfranz@google.com> Tue Dec 13 11:58:12 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 13 11:58:12 2016 +0000
tree 5243ed83be16b353b0da8fcb350d59271a858cd7
parent 0c1712e886621c0a8f4f5868cb490cab1ef59c3a
parent 40408b76ea407f4f00b3cbf7c9a0a84dac4e8348

Merge "DO NOT MERGE: Only select Wi-fi when needed" into nyc-mr2-dev

src/com/android/managedprovisioning/uiflows/PreProvisioningController.java

diff --git a/src/com/android/managedprovisioning/uiflows/PreProvisioningController.java b/src/com/android/managedprovisioning/uiflows/PreProvisioningController.java
index dae288f..06135d2 100644
--- a/src/com/android/managedprovisioning/uiflows/PreProvisioningController.java
+++ b/src/com/android/managedprovisioning/uiflows/PreProvisioningController.java
@@ -251,7 +251,8 @@
         if (mKeyguardManager.inKeyguardRestrictedInputMode()) {
             ProvisionLogger.logi("Cannot pick wifi because the screen is locked.");
             // Have the user pick a wifi network if necessary.
-        } else if (!mUtils.isConnectedToNetwork(mContext) && mParams.wifiInfo == null) {
+        } else if (!mUtils.isConnectedToNetwork(mContext) && mParams.wifiInfo == null
+               && mParams.deviceAdminDownloadInfo != null) {
             if (canRequestWifiPick()) {
                 mUi.requestWifiPick();
                 return;