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

Update dpm command to follow --user convention.

Browse Source 
Bug: 18426246
Change-Id: Ieacba15c4b4bfaf6ac325d20554ac91a1051ca4c
This commit is contained in:
Sudheer Shanka
2015-01-13 14:16:03 +00:00
parent cd0555f273
commit 474c7aceae
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ public final class Dpm extends BaseCommand {
"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-profile-owner <COMPONENT> <USER_ID>\n" +
"usage: dpm set-profile-owner [ --user <USER_ID> ] <COMPONENT>\n" +
"\n" +
"dpm set-active-admin: Sets the given component as active admin" +
" for an existing user.\n" +
@@ -125,23 +125,21 @@ public final class Dpm extends BaseCommand {
}
private void runSetProfileOwner() throws RemoteException {
// To be refactored later to use parseArgs(boolean). Currently in use by existing tests.
ComponentName component = parseComponentName(nextArgRequired());
int userId = parseInt(nextArgRequired());
mDevicePolicyManager.setActiveAdmin(component, true /*refreshing*/, userId);
parseArgs(true);
mDevicePolicyManager.setActiveAdmin(mComponent, true /*refreshing*/, mUserId);
try {
if (!mDevicePolicyManager.setProfileOwner(component, "" /*ownerName*/, userId)) {
throw new RuntimeException("Can't set component " + component.toShortString() +
" as profile owner for user " + userId);
if (!mDevicePolicyManager.setProfileOwner(mComponent, "" /*ownerName*/, mUserId)) {
throw new RuntimeException("Can't set component " + mComponent.toShortString() +
" as profile owner for user " + mUserId);
}
} catch (Exception e) {
// Need to remove the admin that we just added.
mDevicePolicyManager.removeActiveAdmin(component, userId);
mDevicePolicyManager.removeActiveAdmin(mComponent, mUserId);
throw e;
}
System.out.println("Success: Active admin and profile owner set to "
+ component.toShortString() + " for user " + userId);
+ mComponent.toShortString() + " for user " + mUserId);
}
private ComponentName parseComponentName(String component) {