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

Commit 8f617d40 authored by Robin Lee's avatar Robin Lee
Browse files

DevicePolicyManager#removeKeyPair- update contract 

May also return true if the keypair didn't exist in the first place
which is a small reduction in the amount of information leakage, but
more importantly lets a caller be sure about keystore state at the end
of their call.

Bug: 27335182
Change-Id: I5e6d4c599b74f031e3f6d17cb7540898ffaf2571
parent 42d8b7d7

core/java/android/app/admin/DevicePolicyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2753,7 +2753,7 @@ public class DevicePolicyManager { 
     * @param admin Which {@link DeviceAdminReceiver} this request is associated with, or

     *            {@code null} if calling from a delegated certificate installer.

     * @param alias The private key alias under which the certificate is installed.

     * @return {@code true} if the keys were both removed, {@code false} otherwise.

     * @return {@code true} if the certificate alias no longer exists, {@code false} otherwise.

     */

    public boolean removeKeyPair(@Nullable ComponentName admin, @NonNull String alias) {

        try {