diff options
| author | 2024-03-04 18:12:56 +0000 | |
|---|---|---|
| committer | 2024-03-04 18:12:56 +0000 | |
| commit | 939df7b64f7305a7aff3592d89b27ec4549e90bf (patch) | |
| tree | 6a2f77062229175bf4e878776e8ec63cc1e58713 | |
| parent | 0cfbb3aa6f1d135729bc826d906d2119d8900e18 (diff) | |
| parent | a42c8c5a45864920f6f6d645f016dbc4e7cc98f7 (diff) | |
Merge "HwParcel: Remove ambiguous nullability annotation." into main am: a42c8c5a45
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2986669
Change-Id: Ic4a7c033681ba5b26ade9f52e8fbc8c071c37b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/HwParcel.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 0f8ae07d6368..14a49aeacf04 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -10157,7 +10157,7 @@ package android.os { method public final double readDouble(); method public final java.util.ArrayList<java.lang.Double> readDoubleVector(); method public final android.os.HwBlob readEmbeddedBuffer(long, long, long, boolean); - method @NonNull @Nullable public final android.os.HidlMemory readEmbeddedHidlMemory(long, long, long); + method @NonNull public final android.os.HidlMemory readEmbeddedHidlMemory(long, long, long); method @Nullable public final android.os.NativeHandle readEmbeddedNativeHandle(long, long); method public final float readFloat(); method public final java.util.ArrayList<java.lang.Float> readFloatVector(); diff --git a/core/java/android/os/HwParcel.java b/core/java/android/os/HwParcel.java index 9fd37d4548ac..fb500a96c737 100644 --- a/core/java/android/os/HwParcel.java +++ b/core/java/android/os/HwParcel.java @@ -618,7 +618,7 @@ public class HwParcel { */ @FastNative @NonNull - public native final @Nullable + public native final HidlMemory readEmbeddedHidlMemory(long fieldHandle, long parentHandle, long offset); /** |