Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64564f15 authored by Sanal Buvaev's avatar Sanal Buvaev Committed by Automerger Merge Worker
Browse files

Merge "Set ObserverInternal mitigation to zero when it's not present" into main am: c050494b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3063001



Change-Id: Ide3a6ba42ed95f36ab76b70fe1ad8d0c5fc1e59f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 547d5c78 c050494b

services/core/java/com/android/server/PackageWatchdog.java

+8 −1
Original line number Diff line number Diff line
@@ -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())) {