summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-10-02 01:10:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-02 01:10:56 +0000
commitf4ce73e3df1ed4b921bc438cad554dc52cadd066 (patch)
treeb67127ebe652dd2507d1157c915db6d43e4bcaca /core/java
parent30a124ac567c916aa781736ce469742708d6e8ba (diff)
parentcf682d9c2ee064eb2f339b4383134860ed51c6ee (diff)
Merge "Parcel interface token methods @NonNull." am: 403f00bfb8 am: f74b2d4192 am: 008ff2619b am: 92bcee154f am: cf682d9c2e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444678 Change-Id: Id111b38163356f7b8a7dde7db200059a9b1799d7
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/Parcel.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index 1bddc49f839c..13d5f6a9c9d7 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -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);
}