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

Commit 42f6528b authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

New KeyChain API for application access to keystore credentials 

The KeyChain API is Currently in use by Browser and validated by Email
for client certificate authentication.

Change-Id: Ifeab416be594457a05747406e31656e71795cb53
parent 21e2f1b4

api/current.txt

+22 −0
Original line number Diff line number Diff line
@@ -17361,6 +17361,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 {

























core/java/android/security/package.html
deleted100644 → 0



+0
−6




























Original line number
Diff line number
Diff line













<HTML>













<BODY>













Utilities for encrypting messages from hash functions.













{@hide}













</BODY>













</HTML>
























keystore/java/android/security/KeyChain.java



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

































keystore/java/android/security/KeyChainAliasCallback.java



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

















































keystore/java/android/security/KeyChainException.java



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