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

Commit 920f37df authored by Gavin Corkery's avatar Gavin Corkery Committed by Automerger Merge Worker
Browse files

Merge "Add package information to RescueParty uiderrors" into sc-dev am: b854b5ea 

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

Change-Id: I446f1f0de1c5c08250e8f5e0c944d221b5985454
parents 64dac773 b854b5ea

services/core/java/com/android/server/RescueParty.java

+15 −8
Original line number Diff line number Diff line
@@ -361,10 +361,13 @@ public class RescueParty { 
        try {

            executeRescueLevelInternal(context, level, failedPackage);

            EventLogTags.writeRescueSuccess(level);

            logCriticalInfo(Log.DEBUG,

                    "Finished rescue level " + levelToString(level));

            String successMsg = "Finished rescue level " + levelToString(level);

            if (!TextUtils.isEmpty(failedPackage)) {

                successMsg += " for package " + failedPackage;

            }

            logCriticalInfo(Log.DEBUG, successMsg);

        } catch (Throwable t) {

            logRescueException(level, t);

            logRescueException(level, failedPackage, t);

        }

    }
@@ -427,7 +430,7 @@ public class RescueParty { 
                            pm.reboot(TAG);

                        }

                    } catch (Throwable t) {

                        logRescueException(level, t);

                        logRescueException(level, failedPackage, t);

                    }

                };

                thread = new Thread(runnable);
@@ -441,7 +444,7 @@ public class RescueParty { 
                        try {

                            RecoverySystem.rebootPromptAndWipeUserData(context, TAG);

                        } catch (Throwable t) {

                            logRescueException(level, t);

                            logRescueException(level, failedPackage, t);

                        }

                    }

                };
@@ -455,11 +458,15 @@ public class RescueParty { 
        }

    }



    private static void logRescueException(int level, Throwable t) {

    private static void logRescueException(int level, @Nullable String failedPackageName,

            Throwable t) {

        final String msg = ExceptionUtils.getCompleteMessage(t);

        EventLogTags.writeRescueFailure(level, msg);

        logCriticalInfo(Log.ERROR,

                "Failed rescue level " + levelToString(level) + ": " + msg);

        String failureMsg = "Failed rescue level " + levelToString(level);

        if (!TextUtils.isEmpty(failedPackageName)) {

            failureMsg += " for package " + failedPackageName;

        }

        logCriticalInfo(Log.ERROR, failureMsg + ": " + msg);

    }



    private static int mapRescueLevelToUserImpact(int rescueLevel) {