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

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

Merge "Parcel interface token methods @NonNull." am: 403f00bf am: f74b2d41... 

Merge "Parcel interface token methods @NonNull." am: 403f00bf am: f74b2d41 am: 008ff261 am: 92bcee15 am: cf682d9c

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

Change-Id: Id111b38163356f7b8a7dde7db200059a9b1799d7
parents 30a124ac cf682d9c

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -36675,7 +36675,7 @@ package android.os { 
    method public int dataCapacity();

    method public int dataPosition();

    method public int dataSize();

    method public void enforceInterface(String);

    method public void enforceInterface(@NonNull String);

    method public boolean hasFileDescriptors();

    method public byte[] marshall();

    method @NonNull public static android.os.Parcel obtain();
@@ -36746,7 +36746,7 @@ package android.os { 
    method public void writeFloatArray(@Nullable float[]);

    method public void writeInt(int);

    method public void writeIntArray(@Nullable int[]);

    method public void writeInterfaceToken(String);

    method public void writeInterfaceToken(@NonNull String);

    method public void writeList(@Nullable java.util.List);

    method public void writeLong(long);

    method public void writeLongArray(@Nullable long[]);

core/java/android/os/Parcel.java

+2 −2
Original line number Diff line number Diff line
@@ -673,11 +673,11 @@ public final class Parcel { 
     * {@link #dataPosition}.  This is used to validate that the marshalled

     * transaction is intended for the target interface.

     */

    public final void writeInterfaceToken(String interfaceName) {

    public final void writeInterfaceToken(@NonNull String interfaceName) {

        nativeWriteInterfaceToken(mNativePtr, interfaceName);

    }



    public final void enforceInterface(String interfaceName) {

    public final void enforceInterface(@NonNull String interfaceName) {

        nativeEnforceInterface(mNativePtr, interfaceName);

    }

non-updatable-api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -35210,7 +35210,7 @@ package android.os { 
    method public int dataCapacity();

    method public int dataPosition();

    method public int dataSize();

    method public void enforceInterface(String);

    method public void enforceInterface(@NonNull String);

    method public boolean hasFileDescriptors();

    method public byte[] marshall();

    method @NonNull public static android.os.Parcel obtain();
@@ -35281,7 +35281,7 @@ package android.os { 
    method public void writeFloatArray(@Nullable float[]);

    method public void writeInt(int);

    method public void writeIntArray(@Nullable int[]);

    method public void writeInterfaceToken(String);

    method public void writeInterfaceToken(@NonNull String);

    method public void writeList(@Nullable java.util.List);

    method public void writeLong(long);

    method public void writeLongArray(@Nullable long[]);