Merge "Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be" (4af3afb2) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −16

Original line number	Diff line number	Diff line
		@@ -46941,9 +46941,7 @@ package java.io {

		public final class FilePermission extends java.security.Permission implements java.io.Serializable {
		ctor public FilePermission(java.lang.String, java.lang.String);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}

		@@ -50488,9 +50486,7 @@ package java.net {

		public final class SocketPermission extends java.security.Permission implements java.io.Serializable {
		ctor public SocketPermission(java.lang.String, java.lang.String);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}

		@@ -51572,9 +51568,7 @@ package java.security {
		public final class AllPermission extends java.security.Permission {
		ctor public AllPermission();
		ctor public AllPermission(java.lang.String, java.lang.String);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}

		@@ -51588,9 +51582,7 @@ package java.security {
		public abstract class BasicPermission extends java.security.Permission implements java.io.Serializable {
		ctor public BasicPermission(java.lang.String);
		ctor public BasicPermission(java.lang.String, java.lang.String);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}

		@@ -51968,10 +51960,8 @@ package java.security {
		public abstract class Permission implements java.security.Guard java.io.Serializable {
		ctor public Permission(java.lang.String);
		method public void checkGuard(java.lang.Object) throws java.lang.SecurityException;
		method public abstract boolean equals(java.lang.Object);
		method public abstract java.lang.String getActions();
		method public final java.lang.String getName();
		method public abstract int hashCode();
		method public abstract boolean implies(java.security.Permission);
		method public java.security.PermissionCollection newPermissionCollection();
		}
		@@ -52229,13 +52219,11 @@ package java.security {

		public final class UnresolvedPermission extends java.security.Permission implements java.io.Serializable {
		ctor public UnresolvedPermission(java.lang.String, java.lang.String, java.lang.String, java.security.cert.Certificate[]);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public java.lang.String getUnresolvedActions();
		method public java.security.cert.Certificate[] getUnresolvedCerts();
		method public java.lang.String getUnresolvedName();
		method public java.lang.String getUnresolvedType();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}

		@@ -52293,8 +52281,6 @@ package java.security.acl {
		}

		public abstract interface Permission {
		method public abstract boolean equals(java.lang.Object);
		method public abstract java.lang.String toString();
		}

		}
		@@ -61613,11 +61599,9 @@ package javax.security.auth {

		public final class PrivateCredentialPermission extends java.security.Permission {
		ctor public PrivateCredentialPermission(java.lang.String, java.lang.String);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public java.lang.String getCredentialClass();
		method public java.lang.String[][] getPrincipals();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}

api/system-current.txt

+0 −16

Original line number	Diff line number	Diff line
		@@ -49559,9 +49559,7 @@ package java.io {

		public final class FilePermission extends java.security.Permission implements java.io.Serializable {
		ctor public FilePermission(java.lang.String, java.lang.String);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}

		@@ -53106,9 +53104,7 @@ package java.net {

		public final class SocketPermission extends java.security.Permission implements java.io.Serializable {
		ctor public SocketPermission(java.lang.String, java.lang.String);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}

		@@ -54190,9 +54186,7 @@ package java.security {
		public final class AllPermission extends java.security.Permission {
		ctor public AllPermission();
		ctor public AllPermission(java.lang.String, java.lang.String);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}

		@@ -54206,9 +54200,7 @@ package java.security {
		public abstract class BasicPermission extends java.security.Permission implements java.io.Serializable {
		ctor public BasicPermission(java.lang.String);
		ctor public BasicPermission(java.lang.String, java.lang.String);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}

		@@ -54586,10 +54578,8 @@ package java.security {
		public abstract class Permission implements java.security.Guard java.io.Serializable {
		ctor public Permission(java.lang.String);
		method public void checkGuard(java.lang.Object) throws java.lang.SecurityException;
		method public abstract boolean equals(java.lang.Object);
		method public abstract java.lang.String getActions();
		method public final java.lang.String getName();
		method public abstract int hashCode();
		method public abstract boolean implies(java.security.Permission);
		method public java.security.PermissionCollection newPermissionCollection();
		}
		@@ -54847,13 +54837,11 @@ package java.security {

		public final class UnresolvedPermission extends java.security.Permission implements java.io.Serializable {
		ctor public UnresolvedPermission(java.lang.String, java.lang.String, java.lang.String, java.security.cert.Certificate[]);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public java.lang.String getUnresolvedActions();
		method public java.security.cert.Certificate[] getUnresolvedCerts();
		method public java.lang.String getUnresolvedName();
		method public java.lang.String getUnresolvedType();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}

		@@ -54911,8 +54899,6 @@ package java.security.acl {
		}

		public abstract interface Permission {
		method public abstract boolean equals(java.lang.Object);
		method public abstract java.lang.String toString();
		}

		}
		@@ -64231,11 +64217,9 @@ package javax.security.auth {

		public final class PrivateCredentialPermission extends java.security.Permission {
		ctor public PrivateCredentialPermission(java.lang.String, java.lang.String);
		method public boolean equals(java.lang.Object);
		method public java.lang.String getActions();
		method public java.lang.String getCredentialClass();
		method public java.lang.String[][] getPrincipals();
		method public int hashCode();
		method public boolean implies(java.security.Permission);
		}