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

Commit 479210f2 authored by Alexei Nicoara's avatar Alexei Nicoara Committed by Automerger Merge Worker
Browse files

Merge "Updating impact for device config reset" into main am: d81535a4 

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



Change-Id: Id9952ec04ac42c796abe775a6b674f3546ae81e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ce81aff d81535a4

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: