Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Populate error message if apexd.markStagedSessionReady fails

Browse Source 
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
This commit is contained in:
Nikita Ioffe
2019-07-11 10:23:42 +01:00
parent e221abebfd
commit 3e5c848764
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/ApexManager.java
View File

@@ -333,10 +333,14 @@ class ApexManager {
boolean markStagedSessionReady(int sessionId) { boolean markStagedSessionReady(int sessionId) {
if (!isApexSupported()) return false; if (!isApexSupported()) return false;
try { try {
return mApexService.markStagedSessionReady(sessionId); mApexService.markStagedSessionReady(sessionId);
return true;
} catch (RemoteException re) { } catch (RemoteException re) {
Slog.e(TAG, "Unable to contact apexservice", re); Slog.e(TAG, "Unable to contact apexservice", re);
throw new RuntimeException(re); throw new RuntimeException(re);
} catch (Exception e) {
Slog.e(TAG, "Failed to mark session " + sessionId + " ready", e);
return false;
} }
} }