Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new subcommand 'set-active-admin' to the dpm command." into lmp-mr1-dev

Browse Source
This commit is contained in:
Zoltan Szatmary-Ban
2014-11-24 12:08:17 +00:00
committed by Android (Google) Code Review
parent 962b06f9a0 e9119876a2
commit 604aec9574
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmds/dpm/src/com/android/commands/dpm/Dpm.java
View File

@@ -38,18 +38,25 @@ public final class Dpm extends BaseCommand {
(new Dpm()).run(args); (new Dpm()).run(args);
} }
private static final String COMMAND_SET_ACTIVE_ADMIN = "set-active-admin";
private static final String COMMAND_SET_DEVICE_OWNER = "set-device-owner"; private static final String COMMAND_SET_DEVICE_OWNER = "set-device-owner";
private static final String COMMAND_SET_PROFILE_OWNER = "set-profile-owner"; private static final String COMMAND_SET_PROFILE_OWNER = "set-profile-owner";
private IDevicePolicyManager mDevicePolicyManager; private IDevicePolicyManager mDevicePolicyManager;
private int mUserId = UserHandle.USER_OWNER;
private ComponentName mComponent = null;
@Override @Override
public void onShowUsage(PrintStream out) { public void onShowUsage(PrintStream out) {
out.println( out.println(
"usage: dpm [subcommand] [options]\n" + "usage: dpm [subcommand] [options]\n" +
"usage: dpm set-active-admin [ --user <USER_ID> ] <COMPONENT>\n" +
"usage: dpm set-device-owner <COMPONENT>\n" + "usage: dpm set-device-owner <COMPONENT>\n" +
"usage: dpm set-profile-owner <COMPONENT> <USER_ID>\n" + "usage: dpm set-profile-owner <COMPONENT> <USER_ID>\n" +
"\n" + "\n" +
"dpm set-active-admin: Sets the given component as active admin" +
" for an existing user.\n" +
"\n" +
"dpm set-device-owner: Sets the given component as active admin, and its\n" + "dpm set-device-owner: Sets the given component as active admin, and its\n" +
" package as device owner.\n" + " package as device owner.\n" +
"\n" + "\n" +
@@ -68,6 +75,9 @@ public final class Dpm extends BaseCommand {
String command = nextArgRequired(); String command = nextArgRequired();
switch (command) { switch (command) {
case COMMAND_SET_ACTIVE_ADMIN:
runSetActiveAdmin();
break;
case COMMAND_SET_DEVICE_OWNER: case COMMAND_SET_DEVICE_OWNER:
runSetDeviceOwner(); runSetDeviceOwner();
break; break;
@@ -79,6 +89,22 @@ public final class Dpm extends BaseCommand {
} }
} }
private void parseArgs(boolean canHaveUser) {
String nextArg = nextArgRequired();
if (canHaveUser && "--user".equals(nextArg)) {
mUserId = parseInt(nextArgRequired());
nextArg = nextArgRequired();
}
mComponent = parseComponentName(nextArg);
}
private void runSetActiveAdmin() throws RemoteException {
parseArgs(true);
mDevicePolicyManager.setActiveAdmin(mComponent, true /*refreshing*/, mUserId);
System.out.println("Success: Active admin set to component " + mComponent.toShortString());
}
private void runSetDeviceOwner() throws RemoteException { private void runSetDeviceOwner() throws RemoteException {
ComponentName component = parseComponentName(nextArgRequired()); ComponentName component = parseComponentName(nextArgRequired());
mDevicePolicyManager.setActiveAdmin(component, true /*refreshing*/, UserHandle.USER_OWNER); mDevicePolicyManager.setActiveAdmin(component, true /*refreshing*/, UserHandle.USER_OWNER);
@@ -99,6 +125,7 @@ public final class Dpm extends BaseCommand {
} }
private void runSetProfileOwner() throws RemoteException { private void runSetProfileOwner() throws RemoteException {
// To be refactored later to use parseArgs(boolean). Currently in use by existing tests.
ComponentName component = parseComponentName(nextArgRequired()); ComponentName component = parseComponentName(nextArgRequired());
int userId = parseInt(nextArgRequired()); int userId = parseInt(nextArgRequired());
mDevicePolicyManager.setActiveAdmin(component, true /*refreshing*/, userId); mDevicePolicyManager.setActiveAdmin(component, true /*refreshing*/, userId);