summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2021-10-21 16:42:11 +0000
committer Songchun Fan <schfan@google.com> 2021-10-21 16:42:11 +0000
commit2da96da47d2d10c4f326f2b5a72c55f1bd7c724c (patch)
treefdd3de9f19979372f122b09c753e701d8988cec5
parent9ee3eebb99a67200979ca073dbbac8adba0a100d (diff)
Revert "[SettingsProvider] additional logging for debug telephony bug"
This reverts commit 9ee3eebb99a67200979ca073dbbac8adba0a100d. Reason for revert: We've diagnosed the real root cause and is irrelevant to SettingsProvider (b/191309601#comment57) Change-Id: Ic30cd5eb869ff72bb4b2fcd965a57f9684cb6169
-rw-r--r--core/java/android/provider/Settings.java20
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;
}
}