From 10d3cf5082edb42f196ce0d5ac77c7a12b959599 Mon Sep 17 00:00:00 2001
From: Hung-ying Tyan <tyanh@google.com>
Date: Tue, 15 Sep 2009 17:58:57 +0800
Subject: [PATCH] Enable cert install from sdcard in Settings...

And remove ADD_CREDENTIAL intent from AndroidManifest.xml.
---
 AndroidManifest.xml                            | 1 -
 src/com/android/settings/SecuritySettings.java | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7a1760d82e2..c6668710ce2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -300,7 +300,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.SECURITY_SETTINGS" />
                 <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
-                <action android:name="android.security.ADD_CREDENTIAL" />
                 <action android:name="android.security.UNLOCK_CREDENTIAL_STORAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index f3c53cea381..24b89b1f186 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -810,8 +810,7 @@ public class SecuritySettings extends PreferenceActivity implements
         }
 
         private void installCertFromSdCard() {
-            // TODO: uncomment this when the feature is ready
-            //startActivity(new Intent(CertTool.ACTION_INSTALL_CERT_FROM_SDCARD));
+            startActivity(new Intent(CertTool.ACTION_INSTALL_CERT_FROM_SDCARD));
         }
 
         private TextView showError(int messageId) {