am 90d051c3: Merge "Don\'t show Wi-Fi select for EDU secondary users" into mnc-dev

* commit '90d051c39c941b4e3aedc05816e7f9e4f6d75d0c':
  Don't show Wi-Fi select for EDU secondary users

4 files changed, 10 insertions, 4 deletions

diff --git a/src/com/android/managedprovisioning/DeviceOwnerPreProvisioningActivity.java b/src/com/android/managedprovisioning/DeviceOwnerPreProvisioningActivity.java
index 816524a2..569962d7 100644
--- a/src/com/android/managedprovisioning/DeviceOwnerPreProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/DeviceOwnerPreProvisioningActivity.java
@@ -132,7 +132,9 @@ public class DeviceOwnerPreProvisioningActivity extends SetupLayoutActivity
 
         // Have the user pick a wifi network if necessary.
         if (!NetworkMonitor.isConnectedToNetwork(this)
-                && TextUtils.isEmpty(mParams.wifiInfo.ssid)) {
+                && TextUtils.isEmpty(mParams.wifiInfo.ssid)
+                // If a device initializer is installed, this shouldn't run on secondary users.
+                && (!Utils.hasDeviceInitializer(this) || Utils.isCurrentUserOwner())) {
             requestWifiPick();
             return;
             // Wait for onActivityResult.
diff --git a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
index 536d0ac8..ac21c7a0 100644
--- a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
@@ -33,8 +33,6 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.managedprovisioning.task.AddWifiNetworkTask;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/com/android/managedprovisioning/UserInitializedReceiver.java b/src/com/android/managedprovisioning/UserInitializedReceiver.java
index 921eed00..cb78a1b7 100644
--- a/src/com/android/managedprovisioning/UserInitializedReceiver.java
+++ b/src/com/android/managedprovisioning/UserInitializedReceiver.java
@@ -54,7 +54,7 @@ public class UserInitializedReceiver extends BroadcastReceiver {
         DevicePolicyManager dpm = (DevicePolicyManager)
                 context.getSystemService(Context.DEVICE_POLICY_SERVICE);
         if (!Utils.isCurrentUserOwner() && !Utils.isManagedProfile(context) &&
-                dpm != null && dpm.getDeviceInitializerApp() != null) {
+                Utils.hasDeviceInitializer(context)) {
             ProvisionLogger.logi("Initializing secondary user with a device initializer. " +
                     "Starting managed provisioning.");
             requestCACerts(context);
diff --git a/src/com/android/managedprovisioning/Utils.java b/src/com/android/managedprovisioning/Utils.java
index e16650cf..e68b08e8 100644
--- a/src/com/android/managedprovisioning/Utils.java
+++ b/src/com/android/managedprovisioning/Utils.java
@@ -235,6 +235,12 @@ public class Utils {
         return !TextUtils.isEmpty(dpm.getDeviceOwner());
     }
 
+    public static boolean hasDeviceInitializer(Context context) {
+        DevicePolicyManager dpm =
+                (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        return dpm != null && dpm.getDeviceInitializerApp() != null;
+    }
+
     public static boolean isManagedProfile(Context context) {
         UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
         UserInfo user = um.getUserInfo(UserHandle.myUserId());