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

Commit fb07f3eb authored by Sanal Buvaev's avatar Sanal Buvaev Committed by Automerger Merge Worker
Browse files

Merge "Update logging after adding string field to RescuePartyResetReported... 

Merge "Update logging after adding string field to RescuePartyResetReported atom" into main am: 311d8cfc am: 83ca5ade

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



Change-Id: I9a9b4afaf2355df89af1079718fa5fcb88b16113
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 875d1229 83ca5ade

packages/CrashRecovery/services/java/com/android/server/RescueParty.java

+2 −1
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ public class RescueParty { 
            return;

        }



        CrashRecoveryStatsLog.write(CrashRecoveryStatsLog.RESCUE_PARTY_RESET_REPORTED, level);

        CrashRecoveryStatsLog.write(CrashRecoveryStatsLog.RESCUE_PARTY_RESET_REPORTED,

                level, levelToString(level));

        // Try our best to reset all settings possible, and once finished

        // rethrow any exception that we encountered

        Exception res = null;