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

am: 460af2050b

* commit '460af2050ba7ba60d809768cbdbf1772876de3bb':
  DevicePolicyManager#removeKeyPair- update contract
This commit is contained in:
Robin Lee
2016-03-02 21:45:54 +00:00
committed by android-build-merger

View File

@@ -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 {