From eba1c74c97dec5a729d3061396547e66e46d367d Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Tue, 9 Jul 2019 18:44:57 +0100 Subject: [PATCH] ApexManager: Use new submitStagedSession API This is a minimum change required to merge another CL in this topic, which will unblock merging it into AOSP. Change-Id: Ic1a80191e7ef17fb2e11e2ca6e2140131ac08e50 Merged-In: I5ea596ea6417825845c16bbb6e26e9c13845139b Bug: 136548037 Test: atest CtsStagedInstallHostTestCases --- 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 c050be98b4173..012b880c81d89 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; } }