Merge "Handle default properly to avoid scary logging." into lmp-dev (b37ad3d0) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SecuritySettings.java

+4 −8

Original line number	Diff line number	Diff line
		@@ -296,15 +296,11 @@ 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) {
		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));
		}
		} catch (SettingNotFoundException e) {
		Log.w(TAG, "No Lock-to-app enabled setting", e);
		}

		// Show password
		mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);