summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2012-02-15 19:04:04 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-15 19:04:04 -0800
commit43e41580e4c700e970cc5e62180a767ab424da6d (patch)
tree51ce4cc891d418ebab7d1f4bf64a5c0210567689 /keystore
parentfcd93b72a3dde2b20fa0d8b04d3f47311b0856a1 (diff)
downloadframeworks_base-43e41580e4c700e970cc5e62180a767ab424da6d.zip
frameworks_base-43e41580e4c700e970cc5e62180a767ab424da6d.tar.gz
frameworks_base-43e41580e4c700e970cc5e62180a767ab424da6d.tar.bz2
Revert "Act on credential storage updates."
This reverts commit fcd93b72a3dde2b20fa0d8b04d3f47311b0856a1
Diffstat (limited to 'keystore')
-rw-r--r--keystore/java/android/security/KeyChain.java18
1 files changed, 1 insertions, 17 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java
index 0fe7bd8..db6388a 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,22 +167,6 @@ 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