summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-03-28 09:25:51 -0700
committerKenny Root <kroot@google.com>2013-03-28 11:30:11 -0700
commit3e7be43e2555bbdfe311dcbd9a36f7f05321a2d8 (patch)
tree56850ebc6b5f349bb0127b8e92c031b65095c05e /keystore
parent3864aa3944254184ddcd61002cb9f1d7cb1d4c67 (diff)
downloadframeworks_base-3e7be43e2555bbdfe311dcbd9a36f7f05321a2d8.zip
frameworks_base-3e7be43e2555bbdfe311dcbd9a36f7f05321a2d8.tar.gz
frameworks_base-3e7be43e2555bbdfe311dcbd9a36f7f05321a2d8.tar.bz2
Add ability to install credentials as other UID
We need the ability to install from the system UID to wifi UID to explicitly bind WiFi credentials to the WiFi profile. This adds the ability for Wifi Settings to invoke installation of a PKCS12 file for the wifi UID. Bug: 8183258 Change-Id: I652b7e6fa93deda6d6d310be33f224e5a356c787
Diffstat (limited to 'keystore')
-rw-r--r--keystore/java/android/security/Credentials.java8
1 files changed, 8 insertions, 0 deletions
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 class Credentials {
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 class Credentials {
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";