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

Commit bef10595 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into... 

Merge "Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev am: d76033fd" into qt-dev-plus-aosp
parents 43ccb1e9 4f0a1e36

services/devicepolicy/java/com/android/server/devicepolicy/AbUpdateInstaller.java

+11 −2
Original line number Diff line number Diff line
@@ -194,8 +194,17 @@ class AbUpdateInstaller extends UpdateInstaller { 
        }



        UpdateEngine updateEngine = buildBoundUpdateEngine();

        try {

            updateEngine.applyPayload(

                    updatePath, mOffsetForUpdate, mSizeForUpdate, headerKeyValuePairs);

        } catch (Exception e) {

            // Prevent an automatic restart when an update is already being processed

            // (http://b/124106342).

            Log.w(UpdateInstaller.TAG, "Failed to install update from file.", e);

            notifyCallbackOnError(

                    InstallSystemUpdateCallback.UPDATE_ERROR_UNKNOWN,

                    "Failed to install update from file.");

        }

    }



    private boolean updateStateForPayload() throws IOException {