diff options
| -rw-r--r-- | core/java/android/provider/Settings.java | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index db9e40338760..7a2898a7cf57 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -15463,27 +15463,9 @@ public final class Settings { */ public static int getInt(ContentResolver cr, String name, int def) { String v = getString(cr, name); - final boolean isQueryForDeviceProvision = name.equals(DEVICE_PROVISIONED); try { - // TODO(b/197879371): remove the extra logging after bug is fixed - final int result; - if (v != null) { - result = Integer.parseInt(v); - if (isQueryForDeviceProvision) { - Log.w(TAG, "Found settings value for provision. Returning " + result); - } - } else { - result = def; - if (isQueryForDeviceProvision) { - Log.w(TAG, "Missing settings value for provision. Returning " + result); - } - } - return result; + return v != null ? Integer.parseInt(v) : def; } catch (NumberFormatException e) { - if (isQueryForDeviceProvision) { - Log.w(TAG, "Wrong settings value for provision. Found: " + v - + ". Returning " + v); - } return def; } } |