diff options
author | Kenny Root <kroot@google.com> | 2012-08-10 08:28:37 -0700 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2012-08-20 12:44:40 -0700 |
commit | e29df16cb57b69995df597e8a6d95d986c1c43fc (patch) | |
tree | 7cb7fb03ffff118dab968b483bb6d52270cf4ac9 /core/java | |
parent | 473c712b19bad992ab4eafcd43175fdce77b913d (diff) | |
download | frameworks_base-e29df16cb57b69995df597e8a6d95d986c1c43fc.zip frameworks_base-e29df16cb57b69995df597e8a6d95d986c1c43fc.tar.gz frameworks_base-e29df16cb57b69995df597e8a6d95d986c1c43fc.tar.bz2 |
Add AndroidKeyStore provider for KeyStore API
This introduces a public API for the Android keystore that is accessible
via java.security.KeyStore API. This allows programs to store
PrivateKeyEntry and TrustedCertificateEntry items visible only to
themselves.
Future work should include:
* Implement KeyStore.CallbackHandlerProtection parameter to allow the
caller to request that the keystore daemon unlock itself via the
system password input dialog.
* Implement SecretKeyEntry once that support is in keystore daemon
Change-Id: I382ffdf742d3f9f7647c5f5a429244a340b6bb0a
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/app/ActivityThread.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 7eb86f4..4d4b19b 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -81,6 +81,7 @@ import android.view.Window; import android.view.WindowManager; import android.view.WindowManagerImpl; import android.renderscript.RenderScript; +import android.security.AndroidKeyStoreProvider; import com.android.internal.os.BinderInternal; import com.android.internal.os.RuntimeInit; @@ -95,6 +96,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.lang.ref.WeakReference; import java.net.InetAddress; +import java.security.Security; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -4799,6 +4801,8 @@ public final class ActivityThread { // StrictMode) on debug builds, but using DropBox, not logs. CloseGuard.setEnabled(false); + Security.addProvider(new AndroidKeyStoreProvider()); + Process.setArgV0("<pre-initialized>"); Looper.prepareMainLooper(); |