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

Merge "Add SharedMemory.fromFileDescriptor" am: d079236881

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1775625

Change-Id: I5464155029ddbc1e8391ae1717bbc91cb48522a3
This commit is contained in:
Treehugger Robot
2021-08-20 05:08:13 +00:00
committed by Automerger Merge Worker
parent 61555f903b d079236881
commit b2cb2c7994
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -31794,6 +31794,7 @@ package android.os {
method public void close();
method @NonNull public static android.os.SharedMemory create(@Nullable String, int) throws android.system.ErrnoException;
method public int describeContents();
method @NonNull public static android.os.SharedMemory fromFileDescriptor(@NonNull android.os.ParcelFileDescriptor);
method public int getSize();
method @NonNull public java.nio.ByteBuffer map(int, int, int) throws android.system.ErrnoException;
method @NonNull public java.nio.ByteBuffer mapReadOnly() throws android.system.ErrnoException;

20
core/java/android/os/SharedMemory.java
View File

@@ -93,6 +93,26 @@ public final class SharedMemory implements Parcelable, Closeable {
}
}
/**
* Creates an instance from existing shared memory passed as {@link ParcelFileDescriptor}.
*
* <p> The {@code fd} should be a shared memory created from
{@code SharedMemory or ASharedMemory}. This can be useful when shared memory is passed as
file descriptor through JNI or binder service implemented in cpp.
* <p> Note that newly created {@code SharedMemory} takes ownership of passed {@code fd} and
* the original {@code fd} becomes detached (Check {@link ParcelFileDescriptor#detachFd()}).
* If the caller wants to use the file descriptor after the call, the caller should duplicate
* the file descriptor (Check {@link ParcelFileDescriptor#dup()}) and pass the duped version
* instead.
*
* @param fd File descriptor of shared memory passed as {@link ParcelFileDescriptor}.
*/
public static @NonNull SharedMemory fromFileDescriptor(@NonNull ParcelFileDescriptor fd) {
FileDescriptor f = new FileDescriptor();
f.setInt$(fd.detachFd());
return new SharedMemory(f);
}
private static final int PROT_MASK = OsConstants.PROT_READ | OsConstants.PROT_WRITE
| OsConstants.PROT_EXEC | OsConstants.PROT_NONE;