From 7c81c3aa934383071befd4948e28b3a568e1ad5c Mon Sep 17 00:00:00 2001 From: Richard Uhler Date: Wed, 11 Sep 2019 10:43:24 +0100 Subject: [PATCH] Log RemoteExceptions from RollbackManager. It is entirely possible to get a RemoteException from RollbackManager, even if it is in the same process. Remove the comments that suggest otherwise and log the failures instead. Bug: 136461171 Test: atest CtsRollbackManagerHostTestCases:com.android.cts.rollback.host.RollbackManagerHostTest#testApexAndApkStagedRollback Change-Id: I8e7936ada5c19b53be4e3e8dc5ad7165d216d8ac --- .../core/java/com/android/server/pm/StagingManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index 3f2cadeb527d4..3482e92a6fbd4 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -443,7 +443,8 @@ public class StagingManager { try { rm.notifyStagedApkSession(originalSession.sessionId, apkSession.sessionId); } catch (RemoteException re) { - // Cannot happen, the rollback manager is in the same process. + Slog.e(TAG, "Failed to notifyStagedApkSession for session: " + + originalSession.sessionId, re); } } @@ -856,7 +857,8 @@ public class StagingManager { + session.sessionId); } } catch (RemoteException re) { - // Cannot happen, the rollback manager is in the same process. + Slog.e(TAG, "Failed to notifyStagedSession for session: " + + session.sessionId, re); } }