From 5e73256a48cdb10fc72779ce1644d2e13b6669b7 Mon Sep 17 00:00:00 2001 From: Mahaver Chopra Date: Thu, 5 Nov 2015 11:55:12 +0000 Subject: Add ACTION_PROVISION_MANAGED_USER Adding ACTION_PROVISION_MANAGED_USER to DevicePolicyManager. Bug: 25462684 Change-Id: Ic90c3471f3a9c431d728197a19ab25b9946f090a --- core/java/android/app/admin/DevicePolicyManager.java | 8 ++++++++ .../android/server/devicepolicy/DevicePolicyManagerService.java | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index a8ab1e124ad7..ba84642cc803 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -147,6 +147,14 @@ public class DevicePolicyManager { public static final String ACTION_PROVISION_MANAGED_PROFILE = "android.app.action.PROVISION_MANAGED_PROFILE"; + /** + * @hide + * TODO Add Documentation + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_PROVISION_MANAGED_USER + = "android.app.action.PROVISION_MANAGED_USER"; + /** * Activity action: Starts the provisioning flow which sets up a managed device. * Must be started with {@link android.app.Activity#startActivityForResult(Intent, int)}. diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index eaccbc55c0ca..1e32f6037ca7 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -6676,6 +6676,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return false; } return true; + } else if (DevicePolicyManager.ACTION_PROVISION_MANAGED_USER.equals(action)) { + if (hasUserSetupCompleted(callingUserId)) { + return false; + } + return true; } throw new IllegalArgumentException("Unknown provisioning action " + action); } -- cgit v1.2.3-59-g8ed1b