diff options
author | Selim Gurun <sgurun@google.com> | 2012-02-14 11:48:49 -0800 |
---|---|---|
committer | Selim Gurun <sgurun@google.com> | 2012-02-16 14:24:10 -0800 |
commit | 93ba4fedebb78ba47c24e8472c8960ea8fdc933a (patch) | |
tree | 66f36a06854e538cd83fab14c5e8662ef40abd03 /keystore | |
parent | dbbb175258d39fc8a528527a8ce1ad4cb338b496 (diff) | |
download | frameworks_base-93ba4fedebb78ba47c24e8472c8960ea8fdc933a.zip frameworks_base-93ba4fedebb78ba47c24e8472c8960ea8fdc933a.tar.gz frameworks_base-93ba4fedebb78ba47c24e8472c8960ea8fdc933a.tar.bz2 |
Act on credential storage updates.
Bug: 6009802
Cherry pick fcd93b72a3dde2b20fa0d8b04d3f47311b0856a1
Listen to credential storage updates and clean state when necessary.
Change-Id: I2c63e6771e9373da8b39781fdcf3d21583c4e3b2
Diffstat (limited to 'keystore')
-rw-r--r-- | keystore/java/android/security/KeyChain.java | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index db6388a..0fe7bd8 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -124,7 +124,7 @@ public final class KeyChain { public static final String EXTRA_SENDER = "sender"; /** - * Action to bring up the CertInstaller + * Action to bring up the CertInstaller. */ private static final String ACTION_INSTALL = "android.credentials.INSTALL"; @@ -167,6 +167,22 @@ public final class KeyChain { // Compatible with old android.security.Credentials.PKCS12 public static final String EXTRA_PKCS12 = "PKCS12"; + + /** + * @hide TODO This is temporary and will be removed + * Broadcast Action: Indicates the trusted storage has changed. Sent when + * one of this happens: + * + * <ul> + * <li>a new CA is added, + * <li>an existing CA is removed or disabled, + * <li>a disabled CA is enabled, + * <li>trusted storage is reset (all user certs are cleared), + * <li>when permission to access a private key is changed. + * </ul> + */ + public static final String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED"; + /** * Returns an {@code Intent} that can be used for credential * installation. The intent may be used without any extras, in |