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

Merge "Store native failure reason in session failure message" into rvc-dev am: 448b3603e8

Browse Source 
Change-Id: I1c4ba0bfedab14257e67bf94200d80007673a756
This commit is contained in:
Gavin Corkery
2020-04-20 11:20:32 +00:00
committed by Automerger Merge Worker
parent 082f446669 448b3603e8
commit 85c6200090
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,8 +523,12 @@ public class StagingManager {
// TODO(b/146343545): Persist failure reason across checkpoint reboot // TODO(b/146343545): Persist failure reason across checkpoint reboot
Slog.d(TAG, "Reverting back to safe state. Marking " + session.sessionId Slog.d(TAG, "Reverting back to safe state. Marking " + session.sessionId
+ " as failed."); + " as failed.");
session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_UNKNOWN, String errorMsg = "Reverting back to safe state";
"Reverting back to safe state"); if (!TextUtils.isEmpty(mNativeFailureReason)) {
errorMsg = "Entered fs-rollback mode and reverted session due to crashing "
+ "native process: " + mNativeFailureReason;
}
session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_UNKNOWN, errorMsg);
return; return;
} }
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -553,6 +557,10 @@ public class StagingManager {
if (isApexSessionFailed(apexSessionInfo)) { if (isApexSessionFailed(apexSessionInfo)) {
String errorMsg = "APEX activation failed. Check logcat messages from apexd for " String errorMsg = "APEX activation failed. Check logcat messages from apexd for "
+ "more information."; + "more information.";
if (!TextUtils.isEmpty(mNativeFailureReason)) {
errorMsg = "Session reverted due to crashing native process: "
+ mNativeFailureReason;
}
session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED, session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED,
errorMsg); errorMsg);
abortCheckpoint(errorMsg); abortCheckpoint(errorMsg);