Merge "Allow setting the active admin across users."
This commit is contained in:
committed by
Android (Google) Code Review
commit
e5e8444ce8
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user