diff options
| -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 d6952262d82e..ab862fbce248 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -3387,12 +3387,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")) { @@ -3421,7 +3416,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); |