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 /src/com/android/settings/SettingsPreferenceFragment.java | |
| 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 'src/com/android/settings/SettingsPreferenceFragment.java')
| -rw-r--r-- | src/com/android/settings/SettingsPreferenceFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index 60765a9..0a382b5 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -241,7 +241,7 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di mParentFragment = getFragmentManager().findFragmentById(mParentFragmentId); if (!(mParentFragment instanceof DialogCreatable)) { throw new IllegalArgumentException( - (mParentFragment != null + (mParentFragment != null ? mParentFragment.getClass().getName() : mParentFragmentId) + " must implement " |