diff options
| author | 2024-06-13 12:49:21 +0000 | |
|---|---|---|
| committer | 2024-06-13 12:49:21 +0000 | |
| commit | a3ecaee1091c71827778a376eb9579f85e0bb13b (patch) | |
| tree | f45f377ff600906be0b7e0a7aade3010ee0802cf | |
| parent | 6665b8b764fdfe0753b6ba1fa629d4b18155c0fc (diff) | |
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.
Change-Id: I772dbab40541611b948dd7fb3dc0c5536d86b1c3
Test: atest RescuePartyTest
| -rw-r--r-- | services/core/java/com/android/server/PackageWatchdog.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/RescueParty.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java index 966478e33c73..eb037095c6c9 100644 --- a/services/core/java/com/android/server/PackageWatchdog.java +++ b/services/core/java/com/android/server/PackageWatchdog.java @@ -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. */ diff --git a/services/core/java/com/android/server/RescueParty.java b/services/core/java/com/android/server/RescueParty.java index 37c2d263d14f..189b2495c1b1 100644 --- a/services/core/java/com/android/server/RescueParty.java +++ b/services/core/java/com/android/server/RescueParty.java @@ -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: |