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

Commit 67ddfd28 authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam Committed by Android (Google) Code Review
Browse files

Merge "Prevent exceptions in pre-reboot verification from crashing system server"

parents ccf69d08 b560b645

services/core/java/com/android/server/pm/StagingManager.java

+20 −13
Original line number Diff line number Diff line
@@ -1059,6 +1059,7 @@ public class StagingManager { 
                onPreRebootVerificationComplete(session);

                return;

            }

            try {

                switch (msg.what) {

                    case MSG_PRE_REBOOT_VERIFICATION_START:

                        handlePreRebootVerification_Start(session);
@@ -1073,6 +1074,12 @@ public class StagingManager { 
                        handlePreRebootVerification_End(session);

                        break;

                }

            } catch (Exception e) {

                Slog.e(TAG, "Pre-reboot verification failed due to unhandled exception", e);

                onPreRebootVerificationFailure(session,

                        SessionInfo.STAGED_SESSION_ACTIVATION_FAILED,

                        "Pre-reboot verification failed due to unhandled exception: " + e);

            }

        }



        // Notify the handler that system is ready, and reschedule the pre-reboot verifications.