diff options
| author | Kenny Root <kroot@google.com> | 2013-02-04 09:35:16 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-04-06 10:05:31 -0700 |
| commit | 8b51475c97f8f2742047976283afbe1f9ef9fcbf (patch) | |
| tree | 62a1931f70aecc1a156d129b6602274e0c86e3fe /core/java/android/app/ActivityThread.java | |
| parent | 4296704208a9eeb40f4e5fa8d6d1f79c72c322ee (diff) | |
| download | frameworks_base-8b51475c97f8f2742047976283afbe1f9ef9fcbf.zip frameworks_base-8b51475c97f8f2742047976283afbe1f9ef9fcbf.tar.gz frameworks_base-8b51475c97f8f2742047976283afbe1f9ef9fcbf.tar.bz2 | |
Revert "Remove AndroidKeyStore from API"
This reverts commit ce24985ad636c38b6ee01ec9cdecfb038bfeaeb6.
Change-Id: I02d6492c8db869619694c7209bb37522a7ec5a29
Diffstat (limited to 'core/java/android/app/ActivityThread.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 ae0671b..68a2397 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -86,6 +86,7 @@ import android.view.Window; import android.view.WindowManager; import android.view.WindowManagerGlobal; import android.renderscript.RenderScript; +import android.security.AndroidKeyStoreProvider; import com.android.internal.os.BinderInternal; import com.android.internal.os.RuntimeInit; @@ -101,6 +102,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; @@ -5068,6 +5070,8 @@ public final class ActivityThread { // Set the reporter for event logging in libcore EventLogger.setReporter(new EventLoggingReporter()); + Security.addProvider(new AndroidKeyStoreProvider()); + Process.setArgV0("<pre-initialized>"); Looper.prepareMainLooper(); |