diff options
| author | 2024-04-29 16:37:48 +0000 | |
|---|---|---|
| committer | 2024-04-29 16:37:48 +0000 | |
| commit | 64564f15c73c5bf0e48308edbfd548cf06be6ac2 (patch) | |
| tree | 1a20758c1a73c90b2439641eab3c2a7b0a1710eb | |
| parent | 547d5c780a93694d5218e849fccaadf0f33906b7 (diff) | |
| parent | c050494b8e193eb9ac76466d208b0abfcd19e386 (diff) | |
Merge "Set ObserverInternal mitigation to zero when it's not present" into main am: c050494b8e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3063001
Change-Id: Ide3a6ba42ed95f36ab76b70fe1ad8d0c5fc1e59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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())) { |