From 6d36b60bebe77b88e0aff6cefb027f8c6f4716be Mon Sep 17 00:00:00 2001 From: Jessica Hummel Date: Fri, 4 Apr 2014 12:42:17 +0100 Subject: [PATCH] Allow setting the active admin across users. This is required so that provisioning can call it from the primary user when it sets up the mdm on the managed profile. Change-Id: I185af168754aa4aeae61f1d4522c1794681cb400 --- core/java/android/app/admin/DevicePolicyManager.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 30c84f6bf880e..d8be4393f6361 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1534,16 +1534,23 @@ public class DevicePolicyManager { /** * @hide */ - public void setActiveAdmin(ComponentName policyReceiver, boolean refreshing) { + public void setActiveAdmin(ComponentName policyReceiver, boolean refreshing, int userHandle) { if (mService != null) { try { - mService.setActiveAdmin(policyReceiver, refreshing, UserHandle.myUserId()); + mService.setActiveAdmin(policyReceiver, refreshing, userHandle); } catch (RemoteException e) { Log.w(TAG, "Failed talking with device policy service", e); } } } + /** + * @hide + */ + public void setActiveAdmin(ComponentName policyReceiver, boolean refreshing) { + setActiveAdmin(policyReceiver, refreshing, UserHandle.myUserId()); + } + /** * Returns the DeviceAdminInfo as defined by the administrator's package info & meta-data * @hide