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

Commit 8cb63c7a authored by Alexei Nicoara's avatar Alexei Nicoara Committed by Automerger Merge Worker
Browse files

Merge "Add some logging" into main am: a31d8d21 

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



Change-Id: I3bd651438bec289e0aec12a7f7a699081752b470
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c67385a a31d8d21

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

+16 −5
Original line number Diff line number Diff line
@@ -803,22 +803,28 @@ public class RescueParty { 
        @Override

        public int onHealthCheckFailed(@Nullable VersionedPackage failedPackage,

                @FailureReasons int failureReason, int mitigationCount) {

            int impact = PackageHealthObserverImpact.USER_IMPACT_LEVEL_0;

            if (!isDisabled() && (failureReason == PackageWatchdog.FAILURE_REASON_APP_CRASH

                    || failureReason == PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING)) {

                if (Flags.recoverabilityDetection()) {

                    if (!Flags.deprecateFlagsAndSettingsResets()) {

                        return mapRescueLevelToUserImpact(getRescueLevel(mitigationCount,

                        impact =  mapRescueLevelToUserImpact(getRescueLevel(mitigationCount,

                                mayPerformReboot(failedPackage), failedPackage));

                    } else {

                        return mapRescueLevelToUserImpact(getRescueLevel(mitigationCount));

                        impact =  mapRescueLevelToUserImpact(getRescueLevel(mitigationCount));

                    }

                } else {

                    return mapRescueLevelToUserImpact(getRescueLevel(mitigationCount,

                    impact =  mapRescueLevelToUserImpact(getRescueLevel(mitigationCount,

                            mayPerformReboot(failedPackage)));

                }

            } else {

                return PackageHealthObserverImpact.USER_IMPACT_LEVEL_0;

            }



            Slog.i(TAG, "Checking available remediations for health check failure."

                    + " failedPackage: "

                    + (failedPackage == null ? null : failedPackage.getPackageName())

                    + " failureReason: " + failureReason

                    + " available impact: " + impact);

            return impact;

        }



        @Override
@@ -827,6 +833,11 @@ public class RescueParty { 
            if (isDisabled()) {

                return false;

            }

            Slog.i(TAG, "Executing remediation."

                    + " failedPackage: "

                    + (failedPackage == null ? null : failedPackage.getPackageName())

                    + " failureReason: " + failureReason

                    + " mitigationCount: " + mitigationCount);

            if (failureReason == PackageWatchdog.FAILURE_REASON_APP_CRASH

                    || failureReason == PackageWatchdog.FAILURE_REASON_APP_NOT_RESPONDING) {

                final int level;

services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java

+14 −0
Original line number Diff line number Diff line
@@ -154,12 +154,22 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve 
            }

        }



        Slog.i(TAG, "Checking available remediations for health check failure."

                + " failedPackage: "

                + (failedPackage == null ? null : failedPackage.getPackageName())

                + " failureReason: " + failureReason

                + " available impact: " + impact);

        return impact;

    }



    @Override

    public boolean execute(@Nullable VersionedPackage failedPackage,

            @FailureReasons int rollbackReason, int mitigationCount) {

        Slog.i(TAG, "Executing remediation."

                + " failedPackage: "

                + (failedPackage == null ? null : failedPackage.getPackageName())

                + " rollbackReason: " + rollbackReason

                + " mitigationCount: " + mitigationCount);

        if (Flags.recoverabilityDetection()) {

            List<RollbackInfo> availableRollbacks = getAvailableRollbacks();

            if (rollbackReason == PackageWatchdog.FAILURE_REASON_NATIVE_CRASH) {
@@ -503,6 +513,10 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve 
            @FailureReasons int rollbackReason) {

        assertInWorkerThread();



        Slog.i(TAG, "Rolling back package. RollbackId: " + rollback.getRollbackId()

                + " failedPackage: "

                + (failedPackage == null ? null : failedPackage.getPackageName())

                + " rollbackReason: " + rollbackReason);

        final RollbackManager rollbackManager = mContext.getSystemService(RollbackManager.class);

        int reasonToLog = WatchdogRollbackLogger.mapFailureReasonToMetric(rollbackReason);

        final String failedPackageToLog;