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

Commit 18fc0d42 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Update system api for applyPayload" am: c8f699d3 am: 8187d530 am: e29b9871 

Change-Id: Ie04305f97b98750394d58167efe2c5e537855394
parents 65f10772 e29b9871

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7185,7 +7185,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();

        }