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

Commit c8f699d3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update system api for applyPayload"

parents 641fa673 69301416

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6224,7 +6224,7 @@ package android.os { 
    ctor public UpdateEngine();

    method @NonNull public android.os.UpdateEngine.AllocateSpaceResult allocateSpace(@NonNull String, @NonNull String[]);

    method public void applyPayload(String, long, long, String[]);

    method public void applyPayload(@NonNull android.os.ParcelFileDescriptor, long, long, @NonNull String[]);

    method public void applyPayload(@NonNull android.content.res.AssetFileDescriptor, @NonNull String[]);

    method public boolean bind(android.os.UpdateEngineCallback, android.os.Handler);

    method public boolean bind(android.os.UpdateEngineCallback);

    method public void cancel();

core/java/android/os/UpdateEngine.java

+6 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.os; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.content.res.AssetFileDescriptor;

import android.os.IUpdateEngine;

import android.os.IUpdateEngineCallback;

import android.os.RemoteException;
@@ -349,16 +350,17 @@ public class UpdateEngine { 
    }



    /**

     * Applies the payload passed as ParcelFileDescriptor {@code pfd} instead of

     * using the {@code file://} scheme.

     * Applies the payload passed as AssetFileDescriptor {@code assetFd}

     * instead of using the {@code file://} scheme.

     *

     * <p>See {@link #applyPayload(String)} for {@code offset}, {@code size} and

     * {@code headerKeyValuePairs} parameters.

     */

    public void applyPayload(@NonNull ParcelFileDescriptor pfd, long offset, long size,

    public void applyPayload(@NonNull AssetFileDescriptor assetFd,

            @NonNull String[] headerKeyValuePairs) {

        try {

            mUpdateEngine.applyPayloadFd(pfd, offset, size, headerKeyValuePairs);

            mUpdateEngine.applyPayloadFd(assetFd.getParcelFileDescriptor(),

                    assetFd.getStartOffset(), assetFd.getLength(), headerKeyValuePairs);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }