diff options
| author | Geoffrey Borggaard <geoffreyb@google.com> | 2013-08-07 14:57:43 -0400 |
|---|---|---|
| committer | Geoffrey Borggaard <geoffreyb@google.com> | 2013-08-07 14:57:43 -0400 |
| commit | 6e1102d9faf1b8f038857709412c291ef6140aa9 (patch) | |
| tree | 5969c274c388cca35730010b4870ab060ad08305 /res | |
| parent | 8a181dd0d1e710a2376488b158d71db915f73be6 (diff) | |
| download | packages_apps_Settings-6e1102d9faf1b8f038857709412c291ef6140aa9.zip packages_apps_Settings-6e1102d9faf1b8f038857709412c291ef6140aa9.tar.gz packages_apps_Settings-6e1102d9faf1b8f038857709412c291ef6140aa9.tar.bz2 | |
Restriction pin changes.
Fixed bug in WirelessSettings where it was asking users for a PIN when
they weren't restricted. Did this by refactoring the preference level
pin checking into the superclass, where it checks for the restricted mode first.
Also pin protected changes to certificates for restricted users.
Change-Id: I8310fd39f0862159668318fc1360ec6859cc00d5
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml/security_settings_misc.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml index 1ead7a9..dbbeb1d 100644 --- a/res/xml/security_settings_misc.xml +++ b/res/xml/security_settings_misc.xml @@ -80,7 +80,8 @@ android:persistent="false" android:fragment="com.android.settings.TrustedCredentialsSettings"/> - <Preference android:title="@string/credentials_install" + <Preference android:key="credentials_install" + android:title="@string/credentials_install" android:summary="@string/credentials_install_summary" android:persistent="false"> <intent android:action="android.credentials.INSTALL" |