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

Commit 42783c9f authored by Harshit Mahajan's avatar Harshit Mahajan
Browse files

Revert "Rollback package after reboot has been performed" 

This reverts commit 8d9ef830.

Reason for revert: This is incorrectly disabling Rollback

Bug: b/287568263
Change-Id: If5612bd68cd0ba7c3b9e9f68dac84be3f1482164
parent ba63ef90

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

+0 −2
Original line number Diff line number Diff line
@@ -580,7 +580,6 @@ public class PackageWatchdog { 
                     PackageHealthObserverImpact.USER_IMPACT_LEVEL_10,

                     PackageHealthObserverImpact.USER_IMPACT_LEVEL_30,

                     PackageHealthObserverImpact.USER_IMPACT_LEVEL_50,

                     PackageHealthObserverImpact.USER_IMPACT_LEVEL_60,

                     PackageHealthObserverImpact.USER_IMPACT_LEVEL_70,

                     PackageHealthObserverImpact.USER_IMPACT_LEVEL_100})

    public @interface PackageHealthObserverImpact {
@@ -591,7 +590,6 @@ public class PackageWatchdog { 
        /* Actions having medium user impact, user of a device will likely notice. */

        int USER_IMPACT_LEVEL_30 = 30;

        int USER_IMPACT_LEVEL_50 = 50;

        int USER_IMPACT_LEVEL_60 = 60;

        int USER_IMPACT_LEVEL_70 = 70;

        /* Action has high user impact, a last resort, user of a device will be very frustrated. */

        int USER_IMPACT_LEVEL_100 = 100;

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

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ final class RollbackPackageHealthObserver implements PackageHealthObserver { 
            impact = PackageHealthObserverImpact.USER_IMPACT_LEVEL_30;

        } else if (getAvailableRollback(failedPackage) != null) {

            // Rollback is available, we may get a callback into #execute

            impact = PackageHealthObserverImpact.USER_IMPACT_LEVEL_60;

            impact = PackageHealthObserverImpact.USER_IMPACT_LEVEL_30;

        } else if (anyRollbackAvailable) {

            // If any rollbacks are available, we will commit them

            impact = PackageHealthObserverImpact.USER_IMPACT_LEVEL_70;

services/tests/mockingservicestests/src/com/android/server/rollback/RollbackPackageHealthObserverTest.java

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ public class RollbackPackageHealthObserverTest { 
                observer.onHealthCheckFailed(null,

                        PackageWatchdog.FAILURE_REASON_NATIVE_CRASH, 1));

        // non-native crash for the package

        assertEquals(PackageWatchdog.PackageHealthObserverImpact.USER_IMPACT_LEVEL_60,

        assertEquals(PackageWatchdog.PackageHealthObserverImpact.USER_IMPACT_LEVEL_30,

                observer.onHealthCheckFailed(testFailedPackage,

                        PackageWatchdog.FAILURE_REASON_APP_CRASH, 1));

        // non-native crash for a different package