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

Commit 16783b94 authored by Alexei Nicoara's avatar Alexei Nicoara Committed by Android (Google) Code Review
Browse files

Merge "Updating impact for device config reset" into main

parents 214da3da e9dc6661

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: