Merge "Allow setting the active admin across users." (e5e8444c) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -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