Merge "Revert "[SettingsProvider] additional logging for debug telephony bug"" (c67f7700) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+1 −19

Original line number	Diff line number	Diff line
		@@ -15429,27 +15429,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;
		}
		}