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

Merge "Use ParcelFileDescriptor over FileDescriptor"

Browse Source 
am: 56f111e13b

Change-Id: I68c75d02a4eb4bc74fb83efe12ec5dce8d41f7f3
This commit is contained in:
Tao Bao
2019-10-07 09:57:55 -07:00
committed by android-build-merger
parent a027bee3d7 56f111e13b
commit d0ad6794d4
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -5473,7 +5473,7 @@ package android.os {
public class UpdateEngine {
ctor public UpdateEngine();
method public void applyPayload(String, long, long, String[]);
method public void applyPayload(@NonNull java.io.FileDescriptor, long, long, @NonNull String[]);
method public void applyPayload(@NonNull android.os.ParcelFileDescriptor, long, long, @NonNull String[]);
method public boolean bind(android.os.UpdateEngineCallback, android.os.Handler);
method public boolean bind(android.os.UpdateEngineCallback);
method public void cancel();

8
core/java/android/os/UpdateEngine.java
View File

@@ -22,8 +22,6 @@ import android.os.IUpdateEngine;
import android.os.IUpdateEngineCallback;
import android.os.RemoteException;
import java.io.FileDescriptor;
/**
* UpdateEngine handles calls to the update engine which takes care of A/B OTA
* updates. It wraps up the update engine Binder APIs and exposes them as
@@ -315,16 +313,16 @@ public class UpdateEngine {
}
/**
* Applies the payload passed as file descriptor {@code fd} instead of
* Applies the payload passed as ParcelFileDescriptor {@code pfd} 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 FileDescriptor fd, long offset, long size,
public void applyPayload(@NonNull ParcelFileDescriptor pfd, long offset, long size,
@NonNull String[] headerKeyValuePairs) {
try {
mUpdateEngine.applyPayloadFd(fd, offset, size, headerKeyValuePairs);
mUpdateEngine.applyPayloadFd(pfd, offset, size, headerKeyValuePairs);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}