Commit d940ea1a authored by Craig Lafayette's avatar Craig Lafayette
Browse files

Start MP on secondary users only if a DIA is installed.

Bug: 21718395
Change-Id: I406bf2a0c5ada824c79f819fdea44e2fa32e5dd4
parent 67bc3658
......@@ -51,14 +51,14 @@ public class UserInitializedReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent receivedIntent) {
ProvisionLogger.logi("User is initialized");
if (!Utils.isCurrentUserOwner() && !Utils.isManagedProfile(context)) {
DevicePolicyManager dpm = (DevicePolicyManager)
context.getSystemService(Context.DEVICE_POLICY_SERVICE);
if (!Utils.isCurrentUserOwner() && !Utils.isManagedProfile(context) &&
dpm != null && dpm.getDeviceInitializerApp() != null) {
ProvisionLogger.logi("Initializing secondary user with a device initializer. " +
"Starting managed provisioning.");
requestCACerts(context);
if (Utils.hasDeviceOwner(context)) {
ProvisionLogger.logi("Initializing secondary user with a device owner. " +
"Starting managed provisioning.");
launchManagedProvisioning(context);
}
launchManagedProvisioning(context);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment