diff options
| author | Jason Monk <jmonk@google.com> | 2014-08-13 17:32:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 23:14:49 +0000 |
| commit | b37ad3d0e903a602272c8ce6e5c51630b5ca063b (patch) | |
| tree | be06622ec728708d91370037dfff22ad294cab8d /src/com/android/settings | |
| parent | d8e08e55cd6669f5c576b58d8ed7c79ff27c8fa6 (diff) | |
| parent | b08853aad9f3ef2dc3ba1f1c7a513a16220d4d9e (diff) | |
| download | packages_apps_Settings-b37ad3d0e903a602272c8ce6e5c51630b5ca063b.zip packages_apps_Settings-b37ad3d0e903a602272c8ce6e5c51630b5ca063b.tar.gz packages_apps_Settings-b37ad3d0e903a602272c8ce6e5c51630b5ca063b.tar.bz2 | |
Merge "Handle default properly to avoid scary logging." into lmp-dev
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 7f51599..1b9f44c 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -296,14 +296,10 @@ public class SecuritySettings extends SettingsPreferenceFragment root.findPreference(KEY_SIM_LOCK).setEnabled(false); } } - try { - if (Settings.System.getInt(getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED) - != 0) { - root.findPreference(KEY_SCREEN_PINNING).setSummary( - getResources().getString(R.string.switch_on_text)); - } - } catch (SettingNotFoundException e) { - Log.w(TAG, "No Lock-to-app enabled setting", e); + if (Settings.System.getInt(getContentResolver(), + Settings.System.LOCK_TO_APP_ENABLED, 0) != 0) { + root.findPreference(KEY_SCREEN_PINNING).setSummary( + getResources().getString(R.string.switch_on_text)); } // Show password |