diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2009-09-22 09:08:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-22 09:08:01 -0700 |
| commit | aa3500dba73613252adb6964ef7af14bd2d7f6e3 (patch) | |
| tree | b55fa18578aedf52d7ef56e051621e3d036a9a39 /AndroidManifest.xml | |
| parent | 367c7ac866063cc1c658457c55f2dde55c6a3785 (diff) | |
| parent | 031ba6a3648367d307596f11b94367e50651397b (diff) | |
| download | packages_apps_settings-aa3500dba73613252adb6964ef7af14bd2d7f6e3.zip packages_apps_settings-aa3500dba73613252adb6964ef7af14bd2d7f6e3.tar.gz packages_apps_settings-aa3500dba73613252adb6964ef7af14bd2d7f6e3.tar.bz2 | |
am 031ba6a3: Merge change 26365 into eclair
Merge commit '031ba6a3648367d307596f11b94367e50651397b' into eclair-plus-aosp
* commit '031ba6a3648367d307596f11b94367e50651397b':
SecuritySettings: use Credentials instead of CertTool.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 152c636..7e2c248 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -303,7 +303,8 @@ <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.UNLOCK_CREDENTIAL_STORAGE" /> + <action android:name="android.credentials.UNLOCK" /> + <action android:name="android.credentials.SYSTEM_INSTALL" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="com.android.settings.SHORTCUT" /> |