Merge "HwParcel: Remove ambiguous nullability annotation." into main

pa-faiz · Mar 4, 2024 · a42c8c5 · a42c8c5
2 parents 4cb35da + a4592c4
commit a42c8c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
@@ -10583,7 +10583,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
@@ -618,7 +618,7 @@ public final ArrayList<String> readStringVector() {
      */
     @FastNative
     @NonNull
-    public native final @Nullable
+    public native final
     HidlMemory readEmbeddedHidlMemory(long fieldHandle, long parentHandle, long offset);
 
     /**