From a4592c435c230881c2f03fdaca152d6a25a1227a Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Mon, 4 Mar 2024 14:41:59 +0000
Subject: [PATCH] HwParcel: Remove ambiguous nullability annotation.
This function throws IllegalArgumentException if the handle
would be null.
Fixes: 327499594
Test: N/A
Change-Id: Iee6e3d671995d359968c3b2023e2c01a256f57a7
---
core/api/system-current.txt | 2 +-
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 eca138b83dbe4..5b465f4e12b5e 100644
--- 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
index 9fd37d4548ac6..fb500a96c737a 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);
/**
--
GitLab