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

Commit eb47ff6e authored by Caitlin Cassidy's avatar Caitlin Cassidy Committed by Automerger Merge Worker
Browse files

Merge "[Nearby Devices] Minor updates to API based on API review." into tm-dev am: fe570674 

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

Change-Id: I77eba796250f451082df99d61dde34815102fe80
parents 10e644bd fe570674

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -6329,7 +6329,6 @@ package android.media { 
    method public int describeContents();

    method @NonNull public String getMediaRoute2Id();

    method public int getRangeZone();

    method @NonNull public static String rangeZoneToString(int);

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

    field @NonNull public static final android.os.Parcelable.Creator<android.media.NearbyDevice> CREATOR;

    field public static final int RANGE_CLOSE = 3; // 0x3

media/java/android/media/NearbyDevice.java

+5 −2
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ public final class NearbyDevice implements Parcelable { 


    /**

     * Gets a human-readable string of the range zone.

     *

     * @hide

     */

    @NonNull

    public static String rangeZoneToString(@RangeZone int rangeZone) {
@@ -103,13 +105,14 @@ public final class NearbyDevice implements Parcelable { 
    @NonNull private final String mMediaRoute2Id;

    @RangeZone private final int mRangeZone;



    public NearbyDevice(@NonNull String mediaRoute2Id, int rangeZone) {

    /** Creates a device object with the given ID and range zone. */

    public NearbyDevice(@NonNull String mediaRoute2Id, @RangeZone int rangeZone) {

        mMediaRoute2Id = mediaRoute2Id;

        mRangeZone = rangeZone;

    }



    private NearbyDevice(@NonNull Parcel in) {

        mMediaRoute2Id = in.readString();

        mMediaRoute2Id = in.readString8();

        mRangeZone = in.readInt();

    }