commit 1cedb47e18a3acb322914e1963285882dc77d9ba
author Selim Gurun <sgurun@google.com> Thu Mar 15 14:55:15 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 15 14:55:15 2012 -0700
tree 28e75fe0ca8c2601f896e05e50051d450f6b851a
parent a1d2bd829d4804b7841d7c39c8d2ae438b634efb
parent e57319ff880c43b44aaab4905dc8997d97827520

Merge "Make the credential storage change action public."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 6bac58a..ce295d3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18853,6 +18853,7 @@
     method public static android.content.Intent createInstallIntent();
     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;
+    field public static final java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";
     field public static final java.lang.String EXTRA_CERTIFICATE = "CERT";
     field public static final java.lang.String EXTRA_NAME = "name";
     field public static final java.lang.String EXTRA_PKCS12 = "PKCS12";

keystore/java/android/security/KeyChain.java

diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java
index fba5bab..fe03437 100644
--- a/keystore/java/android/security/KeyChain.java
+++ b/keystore/java/android/security/KeyChain.java
@@ -169,7 +169,6 @@
 
 
     /**
-     * @hide TODO This is temporary and will be removed
      * Broadcast Action: Indicates the trusted storage has changed. Sent when
      * one of this happens:
      *