diff options
author | Song Chun Fan <schfan@google.com> | 2024-03-06 00:58:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-06 00:58:03 +0000 |
commit | f529541e1a0e2c397f245f3147c3b28b68bbab4a (patch) | |
tree | ccbb99faaa5359a2ae3bfec1a5a0add92f4fc058 | |
parent | 729b91d11c5213cb5f440c63f24925cd55e54dbd (diff) | |
parent | f160eeba94e5490d679cffff83589b0e6172b8e8 (diff) | |
download | base-f529541e1a0e2c397f245f3147c3b28b68bbab4a.tar.gz |
Merge "Catch IllegalArgumentException as it might indicate corrupted packages.xml" into main
-rw-r--r-- | services/core/java/com/android/server/pm/Settings.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 677a5d11cc6b..e2f8c5071092 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -3194,12 +3194,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile } else if (tagName.equals("verifier")) { final String deviceIdentity = parser.getAttributeValue(null, "device"); - try { - mVerifierDeviceIdentity = VerifierDeviceIdentity.parse(deviceIdentity); - } catch (IllegalArgumentException e) { - Slog.w(PackageManagerService.TAG, "Discard invalid verifier device id: " - + e.getMessage()); - } + mVerifierDeviceIdentity = VerifierDeviceIdentity.parse(deviceIdentity); } else if (TAG_READ_EXTERNAL_STORAGE.equals(tagName)) { // No longer used. } else if (tagName.equals("keyset-settings")) { @@ -3228,7 +3223,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile } str.close(); - } catch (IOException | XmlPullParserException e) { + } catch (IOException | XmlPullParserException | IllegalArgumentException e) { // Remove corrupted file and retry. atomicFile.failRead(str, e); |