Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e5c8487 authored by Nikita Ioffe's avatar Nikita Ioffe
Browse files

Populate error message if apexd.markStagedSessionReady fails 

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
parent e221abeb

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

+5 −1
Original line number Diff line number Diff line
@@ -333,10 +333,14 @@ class ApexManager { 
    boolean markStagedSessionReady(int sessionId) {

        if (!isApexSupported()) return false;

        try {

            return mApexService.markStagedSessionReady(sessionId);

            mApexService.markStagedSessionReady(sessionId);

            return true;

        } catch (RemoteException re) {

            Slog.e(TAG, "Unable to contact apexservice", re);

            throw new RuntimeException(re);

        } catch (Exception e) {

            Slog.e(TAG, "Failed to mark session " + sessionId + " ready", e);

            return false;

        }

    }