Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent exceptions in pre-reboot verification from crashing system server

Browse Source 
An unhandled exception during pre-reboot verification will cause system
server to crash and restart.

Instead of allowing the exception to crash the system server, we now
catch it and fail the corresponding staged session with appropriate
message.

Bug: 170784748
Test: manual
Test: verified that without this fix, any unhandled exception crashes
the system server.

Change-Id: If100796687906be67bc02ea63a78e1b6e291ce7a
This commit is contained in:
Mohammad Samiul Islam
2020-10-23 13:53:52 +01:00
parent df1d9b98d6
commit b560b645ce
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/pm/StagingManager.java
View File

@@ -1059,6 +1059,7 @@ public class StagingManager {
onPreRebootVerificationComplete(session); onPreRebootVerificationComplete(session);
return; return;
} }
try {
switch (msg.what) { switch (msg.what) {
case MSG_PRE_REBOOT_VERIFICATION_START: case MSG_PRE_REBOOT_VERIFICATION_START:
handlePreRebootVerification_Start(session); handlePreRebootVerification_Start(session);
@@ -1073,6 +1074,12 @@ public class StagingManager {
handlePreRebootVerification_End(session); handlePreRebootVerification_End(session);
break; 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. // Notify the handler that system is ready, and reschedule the pre-reboot verifications.