commit ab4d7354ea374fed6261e107be90bb349ea48c49
author Nikita Ioffe <ioffe@google.com> Tue Jul 09 20:48:54 2019 +0100
committer Nikita Ioffe <ioffe@google.com> Wed Jul 10 00:39:21 2019 +0100
tree 582f41f4666f91f7af78c83e9adb9d6181986536
parent 880190e1c18acb4b686b10a83da71a945c659663

Populate error message if apexd.markStagedSessionReady fails

Test: atest CtsStagedInstallHostTestCases
Bug: 136548037
Bug: 122952270
Change-Id: I6fde70418990ee27c1966619badc437c9bffb697

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

diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java
index 2301e3f..dd099b1 100644
--- a/services/core/java/com/android/server/pm/ApexManager.java
+++ b/services/core/java/com/android/server/pm/ApexManager.java
@@ -158,9 +158,9 @@
      * applied at next reboot.
      *
      * @param sessionId the identifier of the {@link PackageInstallerSession} being marked as ready.
-     * @return true upon success, false if the session is unknown.
+     * @throws PackageManagerException if call to apexd fails
      */
-    abstract boolean markStagedSessionReady(int sessionId);
+    abstract void markStagedSessionReady(int sessionId) throws PackageManagerException;
 
     /**
      * Marks a staged session as successful.
@@ -402,12 +402,16 @@
         }
 
         @Override
-        boolean markStagedSessionReady(int sessionId) {
+        void markStagedSessionReady(int sessionId) throws PackageManagerException {
             try {
-                return mApexService.markStagedSessionReady(sessionId);
+                mApexService.markStagedSessionReady(sessionId);
             } catch (RemoteException re) {
                 Slog.e(TAG, "Unable to contact apexservice", re);
                 throw new RuntimeException(re);
+            } catch (Exception e) {
+                throw new PackageManagerException(
+                        PackageInstaller.SessionInfo.STAGED_SESSION_VERIFICATION_FAILED,
+                        "Failed to mark apexd session as ready : " + e.getMessage());
             }
         }
 
@@ -576,7 +580,7 @@
         }
 
         @Override
-        boolean markStagedSessionReady(int sessionId) {
+        void markStagedSessionReady(int sessionId) {
             throw new UnsupportedOperationException();
         }