PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle default properly to avoid scary logging." into lmp-dev

Browse Source
This commit is contained in:
Jason Monk
2014-08-13 17:32:31 +00:00
committed by Android (Google) Code Review
parent d8e08e55cd b08853aad9
commit b37ad3d0e9
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/SecuritySettings.java
View File

@@ -296,15 +296,11 @@ public class SecuritySettings extends SettingsPreferenceFragment
root.findPreference(KEY_SIM_LOCK).setEnabled(false); root.findPreference(KEY_SIM_LOCK).setEnabled(false);
} }
} }
try { if (Settings.System.getInt(getContentResolver(),
if (Settings.System.getInt(getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED) Settings.System.LOCK_TO_APP_ENABLED, 0) != 0) {
!= 0) {
root.findPreference(KEY_SCREEN_PINNING).setSummary( root.findPreference(KEY_SCREEN_PINNING).setSummary(
getResources().getString(R.string.switch_on_text)); getResources().getString(R.string.switch_on_text));
} }
} catch (SettingNotFoundException e) {
Log.w(TAG, "No Lock-to-app enabled setting", e);
}
// Show password // Show password
mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD); mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);