PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 10d3cf50: Enable cert install from sdcard in Settings...

Browse Source 
Merge commit '10d3cf5082edb42f196ce0d5ac77c7a12b959599' into eclair-plus-aosp

* commit '10d3cf5082edb42f196ce0d5ac77c7a12b959599':
  Enable cert install from sdcard in Settings...
This commit is contained in:
Hung-ying Tyan
2009-09-16 01:27:34 -07:00
committed by Android Git Automerger
parent 7b22c68685 10d3cf5082
commit e74b1c6ae4
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -300,7 +300,6 @@
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.SECURITY_SETTINGS" /> <action android:name="android.settings.SECURITY_SETTINGS" />
<action android:name="android.settings.LOCATION_SOURCE_SETTINGS" /> <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
<action android:name="android.security.ADD_CREDENTIAL" />
<action android:name="android.security.UNLOCK_CREDENTIAL_STORAGE" /> <action android:name="android.security.UNLOCK_CREDENTIAL_STORAGE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />

3
src/com/android/settings/SecuritySettings.java
View File

@@ -810,8 +810,7 @@ public class SecuritySettings extends PreferenceActivity implements
} }
private void installCertFromSdCard() { 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) { private TextView showError(int messageId) {