Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "[SettingsProvider] additional logging for debug telephony bug""

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-21 19:46:14 +00:00
committed by Android (Google) Code Review
parent 803a9865be 2da96da47d
commit c67f7700fc
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/provider/Settings.java
View File

@@ -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;
}
}