diff options
| author | 2024-06-13 15:39:48 +0000 | |
|---|---|---|
| committer | 2024-06-13 15:39:48 +0000 | |
| commit | 479210f274a601e865d4bf4caf97b9c1e160704f (patch) | |
| tree | 3ea7829d452a5305546c774fa8fe4bfbde1b3a48 | |
| parent | 0ce81affea9d9d98d2ec797f8b1b1ede6bbce959 (diff) | |
| parent | d81535a4a6680197cd6f7b8ca52bef315ff9efb2 (diff) | |
Merge "Updating impact for device config reset" into main am: d81535a4a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3128396
Change-Id: Id9952ec04ac42c796abe775a6b674f3546ae81e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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: |