diff options
| author | Craig Lafayette <craiglafa@google.com> | 2015-03-28 17:00:52 -0400 |
|---|---|---|
| committer | Craig Lafayette <craiglafa@google.com> | 2015-04-14 08:47:51 -0400 |
| commit | c25553f86f4bcf222ec8d7ad3c23044bb421fef1 (patch) | |
| tree | 59b4badba7fd7e5a0dde2046d407532f1a713a21 /src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java | |
| parent | 09928765ef5a867e460f1824b2c083f8807c8710 (diff) | |
| download | android_packages_apps_ManagedProvisioning-c25553f86f4bcf222ec8d7ad3c23044bb421fef1.tar.gz android_packages_apps_ManagedProvisioning-c25553f86f4bcf222ec8d7ad3c23044bb421fef1.tar.bz2 android_packages_apps_ManagedProvisioning-c25553f86f4bcf222ec8d7ad3c23044bb421fef1.zip | |
Add BluetoothConnectTask.
The BluetoothConnectTask is now the first task run. The
BluetoothConnectionService is started by this task and
will hold/manage the Bluetooth connection.
Upon success, the AddWifiNetworkTask will be run.
Bug: 20001077
Change-Id: I4efe9189678373e3c12d1d7de83cbe435c3af39b
Diffstat (limited to 'src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java')
| -rw-r--r-- | src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java index ea911938..e74cb6ce 100644 --- a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java +++ b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java @@ -170,7 +170,8 @@ public class DeviceOwnerProvisioningActivity extends Activity } // Have the user pick a wifi network if necessary. - if (!AddWifiNetworkTask.isConnectedToWifi(this) && TextUtils.isEmpty(mParams.mWifiSsid)) { + if (!AddWifiNetworkTask.isConnectedToWifi(this) && TextUtils.isEmpty(mParams.mWifiSsid) && + !mParams.mUseBluetoothProxy) { requestWifiPick(); return; // Wait for onActivityResult. |