commit 4e7d24a71a8ad25dc9b49c6da922702fb5ef11ff
author Nikita Ioffe <ioffe@google.com> Fri Jul 05 15:49:45 2019 +0100
committer Nikita Ioffe <ioffe@google.com> Mon Jul 08 19:23:27 2019 +0100
tree 9a9b56bbb17703e14c44365f0ab11e5682daef79
parent 278af8f43c72a67dd9c471b159e5e184fb3e5f0d

Populate error message if apexd verification fails

Test: atest CtsStagedInstallHostTestCases
Test: adb install --wait system/apex/shim/com.android.apex.cts.shim.v2_wrong_sha.apex
Bug: 136548037
Bug: 122952270
Change-Id: I5ea596ea6417825845c16bbb6e26e9c13845139b

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 7e1bc79..2301e3f 100644
--- a/services/core/java/com/android/server/pm/ApexManager.java
+++ b/services/core/java/com/android/server/pm/ApexManager.java
@@ -29,6 +29,7 @@
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
+import android.content.pm.PackageInstaller;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageParser;
 import android.os.RemoteException;
@@ -147,14 +148,10 @@
      * @param childSessionIds if {@code sessionId} is a multi-package session, this should contain
      *                        an array of identifiers of all the child sessions. Otherwise it should
      *                        be an empty array.
-     * @param apexInfoList this is an output parameter, which needs to be initialized by tha caller
-     *                     and will be filled with a list of {@link ApexInfo} objects, each of which
-     *                     contains metadata about one of the packages being submitted as part of
-     *                     the session.
-     * @return whether the submission of the session was successful.
+     * @throws PackageManagerException if call to apexd fails
      */
-    abstract boolean submitStagedSession(
-            int sessionId, @NonNull int[] childSessionIds, @NonNull ApexInfoList apexInfoList);
+    abstract ApexInfoList submitStagedSession(int sessionId, @NonNull int[] childSessionIds)
+            throws PackageManagerException;
 
     /**
      * Mark a staged session previously submitted using {@code submitStagedSession} as ready to be
@@ -388,13 +385,19 @@
         }
 
         @Override
-        boolean submitStagedSession(
-                int sessionId, @NonNull int[] childSessionIds, @NonNull ApexInfoList apexInfoList) {
+        ApexInfoList submitStagedSession(int sessionId, @NonNull int[] childSessionIds)
+                throws PackageManagerException {
             try {
-                return mApexService.submitStagedSession(sessionId, childSessionIds, apexInfoList);
+                final ApexInfoList apexInfoList = new ApexInfoList();
+                mApexService.submitStagedSession(sessionId, childSessionIds, apexInfoList);
+                return apexInfoList;
             } 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,
+                        "apexd verification failed : " + e.getMessage());
             }
         }
 
@@ -566,9 +569,10 @@
         }
 
         @Override
-        boolean submitStagedSession(int sessionId, int[] childSessionIds,
-                ApexInfoList apexInfoList) {
-            throw new UnsupportedOperationException();
+        ApexInfoList submitStagedSession(int sessionId, int[] childSessionIds)
+                throws PackageManagerException {
+            throw new PackageManagerException(PackageManager.INSTALL_FAILED_INTERNAL_ERROR,
+                    "Device doesn't support updating APEX");
         }
 
         @Override