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

Commit fbf2544c authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev am: e4872f2a

am: 460af205

* commit '460af205':
  DevicePolicyManager#removeKeyPair- update contract
parents ec5c7015 460af205
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2750,7 +2750,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 {