Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Parcel interface token methods @NonNull." am: 403f00bfb8 am: f74b2d4192 am: 008ff2619b am: 92bcee154f

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

Change-Id: Ie8c367e500572f3cb1cf8817d28141d52b06867e
This commit is contained in:
Treehugger Robot
2020-10-02 01:02:27 +00:00
committed by Automerger Merge Worker
parent 49aa9c06fa 92bcee154f
commit cf682d9c2e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -36464,7 +36464,7 @@ package android.os {
method public int dataCapacity(); method public int dataCapacity();
method public int dataPosition(); method public int dataPosition();
method public int dataSize(); method public int dataSize();
method public void enforceInterface(String); method public void enforceInterface(@NonNull String);
method public boolean hasFileDescriptors(); method public boolean hasFileDescriptors();
method public byte[] marshall(); method public byte[] marshall();
method @NonNull public static android.os.Parcel obtain(); method @NonNull public static android.os.Parcel obtain();
@@ -36535,7 +36535,7 @@ package android.os {
method public void writeFloatArray(@Nullable float[]); method public void writeFloatArray(@Nullable float[]);
method public void writeInt(int); method public void writeInt(int);
method public void writeIntArray(@Nullable 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 writeList(@Nullable java.util.List);
method public void writeLong(long); method public void writeLong(long);
method public void writeLongArray(@Nullable long[]); method public void writeLongArray(@Nullable long[]);

4
core/java/android/os/Parcel.java
View File

@@ -642,11 +642,11 @@ public final class Parcel {
* {@link #dataPosition}. This is used to validate that the marshalled * {@link #dataPosition}. This is used to validate that the marshalled
* transaction is intended for the target interface. * transaction is intended for the target interface.
*/ */
public final void writeInterfaceToken(String interfaceName) { public final void writeInterfaceToken(@NonNull String interfaceName) {
nativeWriteInterfaceToken(mNativePtr, interfaceName); nativeWriteInterfaceToken(mNativePtr, interfaceName);
} }
public final void enforceInterface(String interfaceName) { public final void enforceInterface(@NonNull String interfaceName) {
nativeEnforceInterface(mNativePtr, interfaceName); nativeEnforceInterface(mNativePtr, interfaceName);
} }

4
non-updatable-api/current.txt
View File

@@ -35031,7 +35031,7 @@ package android.os {
method public int dataCapacity(); method public int dataCapacity();
method public int dataPosition(); method public int dataPosition();
method public int dataSize(); method public int dataSize();
method public void enforceInterface(String); method public void enforceInterface(@NonNull String);
method public boolean hasFileDescriptors(); method public boolean hasFileDescriptors();
method public byte[] marshall(); method public byte[] marshall();
method @NonNull public static android.os.Parcel obtain(); method @NonNull public static android.os.Parcel obtain();
@@ -35102,7 +35102,7 @@ package android.os {
method public void writeFloatArray(@Nullable float[]); method public void writeFloatArray(@Nullable float[]);
method public void writeInt(int); method public void writeInt(int);
method public void writeIntArray(@Nullable 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 writeList(@Nullable java.util.List);
method public void writeLong(long); method public void writeLong(long);
method public void writeLongArray(@Nullable long[]); method public void writeLongArray(@Nullable long[]);