From 4c1e8d0fc8f73d3941ec41dc421dbbaf1aa565f6 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 25 Jan 2021 12:55:47 -0700 Subject: [PATCH] Quietly pivot to default values. Legacy writers would often omit certain attributes, which would result in verbose errors being logged during later parsing. Instead, shift to simply accepting the default value without logging. Bug: 176452293 Test: none Change-Id: Id805ca4332f813942cf6eb75e6a3a6fcec85eaf2 --- .../android/server/pm/permission/LegacyPermission.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/LegacyPermission.java b/services/core/java/com/android/server/pm/permission/LegacyPermission.java index ca3a2e2e2da76..5f8f34210e6be 100644 --- a/services/core/java/com/android/server/pm/permission/LegacyPermission.java +++ b/services/core/java/com/android/server/pm/permission/LegacyPermission.java @@ -167,15 +167,7 @@ public final class LegacyPermission { private static int readInt(@NonNull TypedXmlPullParser parser, @Nullable String namespace, @NonNull String name, int defaultValue) { - try { - return parser.getAttributeInt(namespace, name); - } catch (Exception ignored) { - PackageManagerService.reportSettingsProblem(Log.WARN, - "Error in package manager settings: attribute " + name - + " has bad integer value at " - + parser.getPositionDescription()); - return defaultValue; - } + return parser.getAttributeInt(namespace, name, defaultValue); } /**