Only select Wi-fi when needed

am: 1b33c118 Change-Id: I23eec4dbb07f97a942212e52e2486a0d6a065a84

Only select Wi-fi when needed
am: 1b33c118 Change-Id: I23eec4dbb07f97a942212e52e2486a0d6a065a84
f6b069b9 · Mattias Petersson · android-build-merger · 58116e4f · 1b33c118 · f6b069b9
Commit f6b069b9 authored 8 years ago by Mattias Petersson Committed by android-build-merger 8 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

src/com/android/managedprovisioning/uiflows/PreProvisioningController.java ...anagedprovisioning/uiflows/PreProvisioningController.java +2 -1

No files found.
--- a/src/com/android/managedprovisioning/uiflows/PreProvisioningController.java
+++ b/src/com/android/managedprovisioning/uiflows/PreProvisioningController.java
@@ -251,7 +251,8 @@ public class PreProvisioningController {
        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;