diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2009-09-15 17:58:57 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2009-09-16 15:52:02 +0800 |
| commit | 10d3cf5082edb42f196ce0d5ac77c7a12b959599 (patch) | |
| tree | d5516bd04f55b2a85923b73f15fe81c393bc62d2 | |
| parent | dd498f901efd7984c38e18b548927c19c2b607f0 (diff) | |
| download | packages_apps_settings-10d3cf5082edb42f196ce0d5ac77c7a12b959599.zip packages_apps_settings-10d3cf5082edb42f196ce0d5ac77c7a12b959599.tar.gz packages_apps_settings-10d3cf5082edb42f196ce0d5ac77c7a12b959599.tar.bz2 | |
Enable cert install from sdcard in Settings...
And remove ADD_CREDENTIAL intent from AndroidManifest.xml.
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7a1760d..c666871 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 f3c53ce..24b89b1 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) { |