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

Commit 9ab5255e authored by Sergio Giro's avatar Sergio Giro Committed by android-build-merger
Browse files

Merge \\"api: destroy() and isDestroyed() methods are now default in Destroyable\\" am: 877d6e75

am: 91e11c95

Change-Id: Ib7472ea12d6c59ec6ca36d0c17d63ab5d5193b77
parents ab11a7dd 91e11c95
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -54939,9 +54939,7 @@ package java.security {
  public static class KeyStore.PasswordProtection implements javax.security.auth.Destroyable java.security.KeyStore.ProtectionParameter {
    ctor public KeyStore.PasswordProtection(char[]);
    method public synchronized void destroy() throws javax.security.auth.DestroyFailedException;
    method public synchronized char[] getPassword();
    method public synchronized boolean isDestroyed();
  }
  public static final class KeyStore.PrivateKeyEntry implements java.security.KeyStore.Entry {
@@ -64685,8 +64683,8 @@ package javax.security.auth {
  }
  public abstract interface Destroyable {
    method public abstract void destroy() throws javax.security.auth.DestroyFailedException;
    method public abstract boolean isDestroyed();
    method public default void destroy() throws javax.security.auth.DestroyFailedException;
    method public default boolean isDestroyed();
  }
  public final class PrivateCredentialPermission extends java.security.Permission {
+2 −4
Original line number Diff line number Diff line
@@ -58296,9 +58296,7 @@ package java.security {
  public static class KeyStore.PasswordProtection implements javax.security.auth.Destroyable java.security.KeyStore.ProtectionParameter {
    ctor public KeyStore.PasswordProtection(char[]);
    method public synchronized void destroy() throws javax.security.auth.DestroyFailedException;
    method public synchronized char[] getPassword();
    method public synchronized boolean isDestroyed();
  }
  public static final class KeyStore.PrivateKeyEntry implements java.security.KeyStore.Entry {
@@ -68042,8 +68040,8 @@ package javax.security.auth {
  }
  public abstract interface Destroyable {
    method public abstract void destroy() throws javax.security.auth.DestroyFailedException;
    method public abstract boolean isDestroyed();
    method public default void destroy() throws javax.security.auth.DestroyFailedException;
    method public default boolean isDestroyed();
  }
  public final class PrivateCredentialPermission extends java.security.Permission {