diff options
| author | Bernardo Rufino <brufino@google.com> | 2021-09-30 10:31:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-30 10:31:03 +0000 |
| commit | d60218eb454738577a24dfb0d34b08f0500a6e37 (patch) | |
| tree | 89befaf2392acbbf641cc26b75dea0333e4571d5 /core/java/android | |
| parent | 8efe26afd6919323d06fbcb25dc226efa6cb98e4 (diff) | |
| parent | 1cdbc7cbd1a1fabf44fb30a85afc1eee0b0b7692 (diff) | |
Merge "Log.wtf in mismatch + tests" am: 1cdbc7cbd1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837194
Change-Id: I185410ce82ca057b6767d5ca0ff0368f046a1dff
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/BaseBundle.java | 2 | ||||
| -rw-r--r-- | core/java/android/os/Parcel.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/BaseBundle.java b/core/java/android/os/BaseBundle.java index fb21ce30415f..64d54b820a92 100644 --- a/core/java/android/os/BaseBundle.java +++ b/core/java/android/os/BaseBundle.java @@ -431,7 +431,7 @@ public class BaseBundle { * * @hide */ - public static boolean kindofEquals(BaseBundle a, BaseBundle b) { + public static boolean kindofEquals(@Nullable BaseBundle a, @Nullable BaseBundle b) { return (a == b) || (a != null && a.kindofEquals(b)); } diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index 2be9533e6818..e8e2e6e93622 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -3404,7 +3404,7 @@ public final class Parcel { object = readValue(type, loader); int actual = dataPosition() - start; if (actual != length) { - Log.w(TAG, + Slog.wtfStack(TAG, "Unparcelling of " + object + " of type " + Parcel.valueTypeToString(type) + " consumed " + actual + " bytes, but " + length + " expected."); } |