Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 877d6e75e6

Change-Id: I6ff9e93c43d5f9464ab29604b3aa5f93132ed74b
This commit is contained in:
Sergio Giro
2016-07-27 11:39:10 +00:00
committed by android-build-merger
parent 0d5bcda101 877d6e75e6
commit 91e11c95f2
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

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

6
api/system-current.txt
View File

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