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

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

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

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

Change-Id: Ica39b914561ef61fb15ba06de9451a08c9102d4c
parents ee052afb 403f00bf

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -36464,7 +36464,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();
@@ -36535,7 +36535,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
@@ -642,11 +642,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
@@ -35031,7 +35031,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();
@@ -35102,7 +35102,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[]);