Merge "ApexManager: Use new submitStagedSession API" into stage-aosp-master

am: 968117a4c3

Change-Id: I378357d85183d03c34455789c5b0f92946b8021e

1 files changed, 5 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java
index c050be98b417..012b880c81d8 100644
--- a/services/core/java/com/android/server/pm/ApexManager.java
+++ b/services/core/java/com/android/server/pm/ApexManager.java
@@ -312,10 +312,14 @@ class ApexManager {
             int sessionId, @NonNull int[] childSessionIds, @NonNull ApexInfoList apexInfoList) {
         if (!isApexSupported()) return false;
         try {
-            return mApexService.submitStagedSession(sessionId, childSessionIds, apexInfoList);
+            mApexService.submitStagedSession(sessionId, childSessionIds, apexInfoList);
+            return true;
         } catch (RemoteException re) {
             Slog.e(TAG, "Unable to contact apexservice", re);
             throw new RuntimeException(re);
+        } catch (Exception e) {
+            Slog.e(TAG, "apexd verification failed", e);
+            return false;
         }
     }