diff options
| author | Sanal Buvaev <buvaev@google.com> | 2024-04-29 16:22:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-29 16:22:45 +0000 |
| commit | c050494b8e193eb9ac76466d208b0abfcd19e386 (patch) | |
| tree | 1a20758c1a73c90b2439641eab3c2a7b0a1710eb /services | |
| parent | 7e855b123112a128fbf2208fffe4bc4a5a7e0dd0 (diff) | |
| parent | 5834c7cf76da6f5995dd927cf96abed24a72d6a3 (diff) | |
| download | base-c050494b8e193eb9ac76466d208b0abfcd19e386.tar.gz | |
Merge "Set ObserverInternal mitigation to zero when it's not present" into main
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/PackageWatchdog.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java index 6f20adf74ee2..a61925732256 100644 --- a/services/core/java/com/android/server/PackageWatchdog.java +++ b/services/core/java/com/android/server/PackageWatchdog.java @@ -1396,7 +1396,14 @@ public class PackageWatchdog { int innerDepth = parser.getDepth(); try { if (Flags.recoverabilityDetection()) { - observerMitigationCount = parser.getAttributeInt(null, ATTR_MITIGATION_COUNT); + try { + observerMitigationCount = + parser.getAttributeInt(null, ATTR_MITIGATION_COUNT); + } catch (XmlPullParserException e) { + Slog.i( + TAG, + "ObserverInternal mitigation count was not present."); + } } while (XmlUtils.nextElementWithin(parser, innerDepth)) { if (TAG_PACKAGE.equals(parser.getName())) { |