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

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

Change-Id: Ie1f7f8707dfda71df646c1363a1a7e238301838d
This commit is contained in:
Treehugger Robot
2020-10-02 00:01:22 +00:00
committed by Automerger Merge Worker
3 changed files with 6 additions and 6 deletions

View File

@@ -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[]);

View File

@@ -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);
}

View File

@@ -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[]);