commit 1b33c11804fe094d3eba6198672fded7e7fe823f
author Mattias Petersson <mattias.petersson@sonymobile.com> Thu Nov 03 11:48:03 2016 +0100
committer Mattias Petersson <mattias.petersson@sonymobile.com> Wed Nov 30 13:43:34 2016 +0100
tree 9a932fdb06887f1289f07a74512a94f8ab8a6fbd
parent 0fa07de3558b5aff8a0d960b741abc6af3b9150d

Only select Wi-fi when needed

When doing an NFC provisioning where the DPC is already installed on the
device, the user should not have to select a Wi-Fi. This situation can
happen when an NFC provisioning happens without providing
EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION.

Test: Use NfcProvisioning app to initiate an NFC provisioning without
specifying an SSID and without setting a download location.

Bug:32629443
Change-Id: I0c689bacb3f980daaf9bd3e7ead85ab8e169c6c7

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;