Revert "[SettingsProvider] additional logging for debug telephony bug"
This reverts commit 9ee3eebb99.
Reason for revert: We've diagnosed the real root cause and is irrelevant to SettingsProvider (b/191309601#comment57)
Change-Id: Ic30cd5eb869ff72bb4b2fcd965a57f9684cb6169
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user