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\\\" am: 877d6e75e6 am: 91e11c95f2

Browse Source 
am: 9ab5255ebb

Change-Id: I0d7ad7f86ad800555452940b1d85f0d6da16b90f
This commit is contained in:
Sergio Giro
2016-07-27 11:50:52 +00:00
committed by android-build-merger
parent ef68b1803a 9ab5255ebb
commit 5d1a13d6b4
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

@@ -55127,9 +55127,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 {
@@ -64873,8 +64871,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

@@ -58650,9 +58650,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 {
@@ -68396,8 +68394,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 {