Merge "New KeyChain API for application access to keystore credentials" (3b765f04) · Commits · e / os / android_frameworks_base

api/current.txt

+22 −0

Original line number	Diff line number	Diff line
		@@ -17393,6 +17393,28 @@ package android.sax {

		}

		package android.security {

		public final class KeyChain {
		ctor public KeyChain();
		method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int);
		method public static java.security.cert.X509Certificate[] getCertificateChain(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException;
		method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException;
		}

		public abstract interface KeyChainAliasCallback {
		method public abstract void alias(java.lang.String);
		}

		public class KeyChainException extends java.lang.Exception {
		ctor public KeyChainException();
		ctor public KeyChainException(java.lang.String);
		ctor public KeyChainException(java.lang.String, java.lang.Throwable);
		ctor public KeyChainException(java.lang.Throwable);
		}

		}

		package android.service.wallpaper {

		public abstract class WallpaperService extends android.app.Service {

deleted100644 → 0

+0 −6

Original line number	Diff line number	Diff line
		<HTML>
		<BODY>
		Utilities for encrypting messages from hash functions.
		{@hide}
		</BODY>
		</HTML>

+0 −2

Original line number	Diff line number	Diff line
		@@ -76,8 +76,6 @@ import java.util.concurrent.LinkedBlockingQueue;
		* avoid prompting the user with {@link #choosePrivateKeyAlias
		* choosePrivateKeyAlias} on subsequent connections. If the alias is
		* no longer valid, null will be returned on lookups using that value
		*
		* @hide to be unhidden as part of KeyChain API
		*/
		// TODO reference intent for credential installation when public
		public final class KeyChain {

+0 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@ import java.security.cert.X509Certificate;
		/**
		* The KeyChainAliasCallback is the callback for {@link
		* KeyChain#choosePrivateKeyAlias}.
		*
		* @hide to be unhidden as part of KeyChain API
		*/
		public interface KeyChainAliasCallback {

+0 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,6 @@ package android.security;

		/**
		* Thrown on problems accessing the {@link KeyChain}.
		*
		* @hide to be unhidden as part of KeyChain API
		*/
		public class KeyChainException extends Exception {