diff options
| author | 2023-11-28 21:43:11 +0000 | |
|---|---|---|
| committer | 2023-11-28 21:43:11 +0000 | |
| commit | ef6101d59894bb7e493676b0dd01904d2a1d76e5 (patch) | |
| tree | 4628aea933c9efc41e88a30cb868bf26c37368ed | |
| parent | 39f2ec52401ec16d9a39e1cb2a6ff0e5b459984f (diff) | |
| parent | 9727fd349b927900e07732ad5ab2d8d24e6dabef (diff) | |
Merge "Mark Message.peekData as returning a nullable value." into main am: 9727fd349b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781849
Change-Id: I4eac02aaf2db7985859b8752659c5f7a2f833c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/Message.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 958b2f9f4e26..9bcbd720358a 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -33236,7 +33236,7 @@ package android.os { method public static android.os.Message obtain(android.os.Handler, int, Object); method public static android.os.Message obtain(android.os.Handler, int, int, int); method public static android.os.Message obtain(android.os.Handler, int, int, int, Object); - method public android.os.Bundle peekData(); + method @Nullable public android.os.Bundle peekData(); method public void recycle(); method public void sendToTarget(); method public void setAsynchronous(boolean); diff --git a/core/java/android/os/Message.java b/core/java/android/os/Message.java index 72fb4ae03a63..cc184828cc33 100644 --- a/core/java/android/os/Message.java +++ b/core/java/android/os/Message.java @@ -16,6 +16,7 @@ package android.os; +import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; @@ -436,6 +437,7 @@ public final class Message implements Parcelable { * @see #getData() * @see #setData(Bundle) */ + @Nullable public Bundle peekData() { return data; } |