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

Commit e9dc6661 authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Cherrypicker Worker
Browse files

Updating impact for device config reset 

This would move device config reset step below low impact rollbacks which would ensure that mainline rollbacks happen in case of mainline package starts crashing after mainline update.

Test: atest RescuePartyTest
(cherry picked from https://android-review.googlesource.com/q/commit:a3ecaee1091c71827778a376eb9579f85e0bb13b)
Merged-In: I772dbab40541611b948dd7fb3dc0c5536d86b1c3
Change-Id: I772dbab40541611b948dd7fb3dc0c5536d86b1c3
parent 1f0f9dee

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

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

                     PackageHealthObserverImpact.USER_IMPACT_LEVEL_20,

                     PackageHealthObserverImpact.USER_IMPACT_LEVEL_30,

                     PackageHealthObserverImpact.USER_IMPACT_LEVEL_40,

                     PackageHealthObserverImpact.USER_IMPACT_LEVEL_50,

                     PackageHealthObserverImpact.USER_IMPACT_LEVEL_70,

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

        int USER_IMPACT_LEVEL_20 = 20;

        int USER_IMPACT_LEVEL_30 = 30;

        int USER_IMPACT_LEVEL_40 = 40;

        int USER_IMPACT_LEVEL_50 = 50;

        int USER_IMPACT_LEVEL_70 = 70;

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

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

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ public class RescueParty { 
                case RESCUE_LEVEL_SCOPED_DEVICE_CONFIG_RESET:

                    return PackageHealthObserverImpact.USER_IMPACT_LEVEL_10;

                case RESCUE_LEVEL_ALL_DEVICE_CONFIG_RESET:

                    return PackageHealthObserverImpact.USER_IMPACT_LEVEL_20;

                    return PackageHealthObserverImpact.USER_IMPACT_LEVEL_40;

                case RESCUE_LEVEL_WARM_REBOOT:

                    return PackageHealthObserverImpact.USER_IMPACT_LEVEL_50;

                case RESCUE_LEVEL_RESET_SETTINGS_UNTRUSTED_DEFAULTS: