am a9744790: Merge "Make dpm command output more test friendly" into lmp-dev

* commit 'a97447905d8f2480885112288bcee1c4c126d45e':
  Make dpm command output more test friendly
This commit is contained in:
Esteban Talavera
2014-09-18 18:23:45 +00:00
committed by Android Git Automerger

View File

@@ -94,7 +94,7 @@ public final class Dpm extends BaseCommand {
mDevicePolicyManager.removeActiveAdmin(component, UserHandle.USER_OWNER);
throw e;
}
System.out.println("Device owner set to package " + packageName);
System.out.println("Success: Device owner set to package " + packageName);
System.out.println("Active admin set to component " + component.toShortString());
}
@@ -113,8 +113,8 @@ public final class Dpm extends BaseCommand {
mDevicePolicyManager.removeActiveAdmin(component, userId);
throw e;
}
System.out.println("Active admin and profile owner set to " + component.toShortString() +
" for user " + userId);
System.out.println("Success: Active admin and profile owner set to "
+ component.toShortString() + " for user " + userId);
}
private ComponentName parseComponentName(String component) {