OSDN Git Service

Handle default properly to avoid scary logging.
authorJason Monk <jmonk@google.com>
Wed, 13 Aug 2014 13:43:58 +0000 (09:43 -0400)
committerJason Monk <jmonk@google.com>
Wed, 13 Aug 2014 17:09:31 +0000 (13:09 -0400)
Lock-to-app enabled should default to false and not bother logging
about it not being set yet.

Bug: 16958525
Change-Id: If0d595107d4d40a62ac5d2cc461a8aa18ff80e19

src/com/android/settings/SecuritySettings.java

index 1fb5e13..61daf8b 100644 (file)
@@ -291,14 +291,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