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

Commit 91e11c95 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

Change-Id: I6ff9e93c43d5f9464ab29604b3aa5f93132ed74b
parents 0d5bcda1 877d6e75

api/current.txt

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

























api/system-current.txt



+2
−4




























Original line number
Diff line number
Diff line








@@ -58295,9 +58295,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 {










@@ -68041,8 +68039,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 {