From 3e5c848764875d1833a92fd7309ab2b1c30fdfb8 Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Thu, 11 Jul 2019 10:23:42 +0100
Subject: [PATCH] Populate error message if apexd.markStagedSessionReady fails

This is a minimum change required to merge apexd CL in this topic,
which will unblock merging it into AOSP.

Test: atest CtsStagedInstallHostTestCases
Bug: 136548037
Bug: 122952270
Change-Id: I97fef3cb4b162568b493ed144fe270415db01ab9
Merged-In: I6fde70418990ee27c1966619badc437c9bffb697
---
 services/core/java/com/android/server/pm/ApexManager.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java
index 012b880c81d89..a0c00f8c9b69b 100644
--- a/services/core/java/com/android/server/pm/ApexManager.java
+++ b/services/core/java/com/android/server/pm/ApexManager.java
@@ -333,10 +333,14 @@ class ApexManager {
     boolean markStagedSessionReady(int sessionId) {
         if (!isApexSupported()) return false;
         try {
-            return mApexService.markStagedSessionReady(sessionId);
+            mApexService.markStagedSessionReady(sessionId);
+            return true;
         } catch (RemoteException re) {
             Slog.e(TAG, "Unable to contact apexservice", re);
             throw new RuntimeException(re);
+        } catch (Exception e) {
+            Slog.e(TAG, "Failed to mark session " + sessionId + " ready", e);
+            return false;
         }
     }