diff options
| author | 2024-01-29 17:34:18 +0000 | |
|---|---|---|
| committer | 2024-01-29 17:34:18 +0000 | |
| commit | 549f7490038c092983d7c48ee64f5b32990a779c (patch) | |
| tree | 783154ba601c9b3044efc7881ee59a672145bca4 | |
| parent | 610f44db26f48419020983cce022efb5a05c06bb (diff) | |
| parent | feabe0520776d6c92f52257474ea9439cd0b1ca5 (diff) | |
Merge "Disabling RescueParty flag resets" into main am: feabe05207
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2931490
Change-Id: I8b09b066de6f500eedc599f9900870e6c6621d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/CrashRecovery/services/java/com/android/server/RescueParty.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/CrashRecovery/services/java/com/android/server/RescueParty.java b/packages/CrashRecovery/services/java/com/android/server/RescueParty.java index eb65b2a9eedd..dd543349fc4d 100644 --- a/packages/CrashRecovery/services/java/com/android/server/RescueParty.java +++ b/packages/CrashRecovery/services/java/com/android/server/RescueParty.java @@ -382,6 +382,14 @@ public class RescueParty { private static void executeRescueLevelInternal(Context context, int level, @Nullable String failedPackage) throws Exception { + + if (level <= LEVEL_RESET_SETTINGS_TRUSTED_DEFAULTS) { + // Disabling flag resets on master branch for trunk stable launch. + // TODO(b/287618292): Re-enable them after the trunk stable is launched and we + // figured out a way to reset flags without interfering with trunk development. + return; + } + FrameworkStatsLog.write(FrameworkStatsLog.RESCUE_PARTY_RESET_REPORTED, level); // Try our best to reset all settings possible, and once finished // rethrow any exception that we encountered |