Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 883887f6 authored by Mateus Azis's avatar Mateus Azis Committed by Automerger Merge Worker
Browse files

Merge "Mark Message.peekData as returning a nullable value." into main am:... 

Merge "Mark Message.peekData as returning a nullable value." into main am: 9727fd34 am: ef6101d5 am: e278ff43

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



Change-Id: I9a598c10f598d00f44d4e70b5b435e07110b31e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68f917e3 e278ff43

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32840,7 +32840,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);

core/java/android/os/Message.java

+2 −0
Original line number Diff line number Diff line
@@ -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;
@@ -437,6 +438,7 @@ public final class Message implements Parcelable { 
     * @see #getData()

     * @see #setData(Bundle)

     */

    @Nullable

    public Bundle peekData() {

        return data;

    }