Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3c5cb8f authored by Esteban Talavera's avatar Esteban Talavera Committed by Android Git Automerger
Browse files

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

* commit '9cc0285e37f7c0330847b693ebf3ca50f97dce23':
  Make dpm command output more test friendly
parents 3ed26275 9b73513b

cmds/dpm/src/com/android/commands/dpm/Dpm.java

+3 −3
Original line number Diff line number Diff line
@@ -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) {