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

Merge "Improve HidlMemory annotation"

Browse Source
This commit is contained in:
Ytai Ben-tsvi
2020-01-22 00:51:35 +00:00
committed by Android (Google) Code Review
parent f85d48c900 70ba0ac09e
commit 4d1830d141
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -7591,7 +7591,7 @@ package android.os {
method @Nullable public android.os.NativeHandle getHandle();
method @NonNull public String getName();
method public long getSize();
method @NonNull public android.os.NativeHandle releaseHandle();
method @Nullable public android.os.NativeHandle releaseHandle();
}
public class HidlSupport {

2
api/test-current.txt
View File

@@ -1893,7 +1893,7 @@ package android.os {
method @Nullable public android.os.NativeHandle getHandle();
method @NonNull public String getName();
method public long getSize();
method @NonNull public android.os.NativeHandle releaseHandle();
method @Nullable public android.os.NativeHandle releaseHandle();
}
public abstract class HwBinder implements android.os.IHwBinder {

4
core/java/android/os/HidlMemory.java
View File

@@ -85,11 +85,11 @@ public class HidlMemory implements Closeable {
}
/**
* Disowns the underlying handle and returns it. This object becomes invalid.
* Disowns the underlying handle and returns it. The underlying handle becomes null.
*
* @return The underlying handle.
*/
@NonNull
@Nullable
public NativeHandle releaseHandle() {
NativeHandle handle = mHandle;
mHandle = null;