diff options
author | Tao Bao <tbao@google.com> | 2019-10-07 16:38:11 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-07 16:38:11 +0000 |
commit | 56f111e13b088b33a219df4f57dfd3c0858117aa (patch) | |
tree | 8d9bc40f2f95fd5a026003b077566e35b0bbc5e3 | |
parent | c6a12ee85c7e9331813737fb22e91fe9417df156 (diff) | |
parent | 73fde3809aa1373c76911ffa7f6ddd6ed85fee0b (diff) | |
download | base-56f111e13b088b33a219df4f57dfd3c0858117aa.tar.gz |
Merge "Use ParcelFileDescriptor over FileDescriptor"
-rw-r--r-- | api/system-current.txt | 2 | ||||
-rw-r--r-- | core/java/android/os/UpdateEngine.java | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index d854976ac8a6..5bac2b733380 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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(); diff --git a/core/java/android/os/UpdateEngine.java b/core/java/android/os/UpdateEngine.java index dd5e20e39904..a9ddffe7d55c 100644 --- a/core/java/android/os/UpdateEngine.java +++ b/core/java/android/os/UpdateEngine.java @@ -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(); } |