commit 02c86306d2569d18a49da3d9228dacb25b1f8973
author Kenny Root <kroot@google.com> Thu Mar 28 20:56:58 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 28 20:56:58 2013 +0000
tree 08c953f7ad52251d6fe4807ec3fdc4e43f38ce9d
parent a19647d3d81d3bdd15ad3bc8a2ece8e7bd1095fe
parent 3e7be43e2555bbdfe311dcbd9a36f7f05321a2d8

Merge "Add ability to install credentials as other UID"

keystore/java/android/security/Credentials.java

diff --git a/keystore/java/android/security/Credentials.java b/keystore/java/android/security/Credentials.java
index d8109ce..166849d 100644
--- a/keystore/java/android/security/Credentials.java
+++ b/keystore/java/android/security/Credentials.java
@@ -49,6 +49,8 @@
 
     public static final String INSTALL_ACTION = "android.credentials.INSTALL";
 
+    public static final String INSTALL_AS_USER_ACTION = "android.credentials.INSTALL_AS_USER";
+
     public static final String UNLOCK_ACTION = "com.android.credentials.UNLOCK";
 
     /** Key prefix for CA certificates. */
@@ -83,6 +85,12 @@
     public static final String EXTENSION_PFX = ".pfx";
 
     /**
+     * Intent extra: install the certificate bundle as this UID instead of
+     * system.
+     */
+    public static final String EXTRA_INSTALL_AS_UID = "install_as_uid";
+
+    /**
      * Intent extra: name for the user's private key.
      */
     public static final String EXTRA_USER_PRIVATE_KEY_NAME = "user_private_key_name";