commit a42c8c5a45864920f6f6d645f016dbc4e7cc98f7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 04 17:18:13 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 04 17:18:13 2024 +0000
tree 74ec6a43117fbb9016a9688ad7ff1861f6267d49
parent 4cb35da81ed8e6a0937a53e4bae2ef692fb3e806
parent a4592c435c230881c2f03fdaca152d6a25a1227a

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

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 12802e4..0436719 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -10583,7 +10583,7 @@
     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();

core/java/android/os/HwParcel.java

diff --git a/core/java/android/os/HwParcel.java b/core/java/android/os/HwParcel.java
index 9fd37d4..fb500a9 100644
--- a/core/java/android/os/HwParcel.java
+++ b/core/java/android/os/HwParcel.java
@@ -618,7 +618,7 @@
      */
     @FastNative
     @NonNull
-    public native final @Nullable
+    public native final
     HidlMemory readEmbeddedHidlMemory(long fieldHandle, long parentHandle, long offset);
 
     /**