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

Commit bcd9e60e authored by JW Wang's avatar JW Wang
Browse files

Convert rollback type to string to improve logging 

Bug: 147204526
Test: atest StagedRollbackTest#testNativeWatchdogTriggersRollback
Change-Id: I63303853ed2179fecd7037dd1e76a4d3653c3039
parent 9e87abdc

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

+16 −1
Original line number Diff line number Diff line
@@ -333,9 +333,24 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve 
        return rollbackId;

    }



    private static String rollbackTypeToString(int type) {

        switch (type) {

            case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE:

                return "ROLLBACK_INITIATE";

            case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS:

                return "ROLLBACK_SUCCESS";

            case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE:

                return "ROLLBACK_FAILURE";

            case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_BOOT_TRIGGERED:

                return "ROLLBACK_BOOT_TRIGGERED";

            default:

                return "UNKNOWN";

        }

    }



    private static void logEvent(@Nullable VersionedPackage moduleMetadataPackage, int type,

            int rollbackReason, @NonNull String failingPackageName) {

        Slog.i(TAG, "Watchdog event occurred of type: " + type);

        Slog.i(TAG, "Watchdog event occurred of type: " + rollbackTypeToString(type));

        if (moduleMetadataPackage != null) {

            StatsLog.logWatchdogRollbackOccurred(type, moduleMetadataPackage.getPackageName(),

                    moduleMetadataPackage.getVersionCode(), rollbackReason, failingPackageName);