diff options
| author | Kenny Root <kroot@google.com> | 2012-09-14 16:55:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-14 16:55:47 -0700 |
| commit | 1c9894aa7f0eaa9ab562c1c384317456fd99dd6c (patch) | |
| tree | 8762c28fea8cd4df09f30065321bd4ac9fb6503e /core/java | |
| parent | 424968261fb346859a7ac796703527f2e34c0a84 (diff) | |
| parent | ce24985ad636c38b6ee01ec9cdecfb038bfeaeb6 (diff) | |
| download | frameworks_base-1c9894aa7f0eaa9ab562c1c384317456fd99dd6c.zip frameworks_base-1c9894aa7f0eaa9ab562c1c384317456fd99dd6c.tar.gz frameworks_base-1c9894aa7f0eaa9ab562c1c384317456fd99dd6c.tar.bz2 | |
Merge "Remove AndroidKeyStore from API" into jb-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 1cd5fa2..cb4d4a1 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -84,7 +84,6 @@ 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; @@ -4891,8 +4890,6 @@ 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(); |