Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 939df7b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2986669



Change-Id: Ic4a7c033681ba5b26ade9f52e8fbc8c071c37b18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cfbb3aa a42c8c5a

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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();

core/java/android/os/HwParcel.java

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ public class HwParcel { 
     */

    @FastNative

    @NonNull

    public native final @Nullable

    public native final

    HidlMemory readEmbeddedHidlMemory(long fieldHandle, long parentHandle, long offset);



    /**