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

Commit 01f07e5f authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "Added @Nullable to ContentCaptureContext.getLocusId()"

parents 6ce0f585 56bddaab

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -53033,7 +53033,7 @@ package android.view.contentcapture { 
    method public int describeContents();

    method @NonNull public static android.view.contentcapture.ContentCaptureContext forLocusId(@NonNull String);

    method @Nullable public android.os.Bundle getExtras();

    method @NonNull public android.content.LocusId getLocusId();

    method @Nullable public android.content.LocusId getLocusId();

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.view.contentcapture.ContentCaptureContext> CREATOR;

  }

core/java/android/view/contentcapture/ContentCaptureContext.java

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public final class ContentCaptureContext implements Parcelable { 
    /**

     * Gets the context id.

     */

    @NonNull

    @Nullable

    public LocusId getLocusId() {

        return mId;

    }